LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: bootm: Fix broken boot_env_legacy codepath 

This patch fixes 2 bugs introduced by the following commit

2bb5b63 MIPS: bootm: rework and fix broken bootm code

The CONFIG_IS_ENABLED macro prepends 'CONFIG_' Hence, remove CONFIG_
from CONFIG_MIPS_BOOT_ENV_LEGACY usage.

Also, 2bb5b63 reworks bootm so that linux_env_legacy runs before
linux_cmdline_legacy. However, linux_env_legacy depends on
linux_cmdline_legacy running first as linux_cmdline_init initialilzes
linux_argp which linux_env_legacy later depends on during its
initialization.

Reorder the code so that linux_cmdline_legacy runs before
linux_env_legacy.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
This commit is contained in:
Zubair Lutfullah Kakakhel 2017-07-11 16:47:51 +01:00 committed by Daniel Schwierzeck
parent 703ec9ddf9
commit 48bfc31b64
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/lib/bootm.c
View File

@ -279,17 +279,17 @@ static void boot_prep_linux(bootm_headers_t *images)
boot_reloc_fdt(images); boot_reloc_fdt(images);
boot_setup_fdt(images); boot_setup_fdt(images);
} else { } else {
if (CONFIG_IS_ENABLED(CONFIG_MIPS_BOOT_ENV_LEGACY))
linux_env_legacy(images);
if (CONFIG_IS_ENABLED(MIPS_BOOT_CMDLINE_LEGACY)) { if (CONFIG_IS_ENABLED(MIPS_BOOT_CMDLINE_LEGACY)) {
linux_cmdline_legacy(images); linux_cmdline_legacy(images);
if (!CONFIG_IS_ENABLED(CONFIG_MIPS_BOOT_ENV_LEGACY)) if (!CONFIG_IS_ENABLED(MIPS_BOOT_ENV_LEGACY))
linux_cmdline_append(images); linux_cmdline_append(images);
linux_cmdline_dump(); linux_cmdline_dump();
} }
if (CONFIG_IS_ENABLED(MIPS_BOOT_ENV_LEGACY))
linux_env_legacy(images);
} }
} }