Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MIPS: Pass kexec command line options into DTB's internal command line #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions kexec/arch/mips/kexec-elf-mips.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ int elf_mips_load(int argc, char **argv, const char *buf, off_t len,

if (arch_options.dtb_file) {
dtb_buf = slurp_file(arch_options.dtb_file, &dtb_length);
/* For systems using DTB as opposed to relying on the FDT
* created below, we need to pass command line options
* into the command line in the DTB. Otherwise, non-Octeon
* systems will need to patch Linux kernel to pass the new
* cmdline like Octeon does.
*/
dtb_set_bootargs(&dtb_buf, &dtb_length, cmdline_buf + strlen(CMDLINE_PREFIX));
} else {
create_flatten_tree(&dtb_buf, &dtb_length, cmdline_buf + strlen(CMDLINE_PREFIX));
}
Expand Down