d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: Fix bug introduced in r297286.

Browse Source 
- don't put command line without guard to kernel environment.
 - kernel environment delivered from ubldr must have absolute precedence.
This commit is contained in:
Michal Meloun 2016-03-26 12:19:27 +00:00
parent 1427ff7da9
commit 8cc018c369
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arm/arm/machdep.c
View File

@ -1049,13 +1049,10 @@ cmdline_set_env(char *cmdline, const char *guard)
/* Test and remove guard. */
if (guard != NULL && guard[0] != '\0') {
guard_len = strlen(guard);
if (strncasecmp(cmdline, guard, guard_len) != 0){
init_static_kenv(cmdline, 0);
if (strncasecmp(cmdline, guard, guard_len) != 0)
return;
cmdline += guard_len;
size -= guard_len;
}
cmdline += guard_len;
size -= guard_len;
}
/* Skip leading spaces. */
@ -1833,7 +1830,7 @@ initarm(struct arm_boot_params *abp)
panic("OF_init failed with the found device tree");
#if defined(LINUX_BOOT_ABI)
if (fdt_get_chosen_bootargs(linux_command_line,
if (loader_envp == NULL && fdt_get_chosen_bootargs(linux_command_line,
LBABI_MAX_COMMAND_LINE) == 0)
cmdline_set_env(linux_command_line, CMDLINE_GUARD);
#endif