Fix NOR, SD and QSPI fallback option failure in case of secure boot

Signed-off-by: Vinitha V Pillai vinitha.pillai@nxp.com ---

Changes in v2: Changed the commit message. Since changes have been made for NOR, SD and QSPI, that has been added in the commit message

include/configs/ls2080ardb.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 6f3301c..8770c6b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -375,7 +375,7 @@ unsigned long get_board_sys_clk(void); "fdt_high=0xa0000000\0" \ "initrd_high=0xffffffffffffffff\0" \ "fdt_addr=0x64f00000\0" \ - "kernel_addr=0x65000000\0" \ + "kernel_addr=0x581000000\0" \ "kernel_start=0x1000000\0" \ "kernelheader_start=0x800000\0" \ "scriptaddr=0x80000000\0" \ @@ -445,8 +445,8 @@ unsigned long get_board_sys_clk(void); "&& esbc_validate 0x20780000; " \ "env exists mcinitcmd && " \ "fsl_mc lazyapply dpl 0x20d00000; " \ - "run distro_bootcmd;env exists secureboot " \ - " && esbc_halt;run qspi_bootcmd; " + "run distro_bootcmd;run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;" #elif defined(CONFIG_SD_BOOT) /* Try to boot an on-SD kernel first, then do normal distro boot */ #define CONFIG_BOOTCOMMAND \ @@ -456,16 +456,16 @@ unsigned long get_board_sys_clk(void); "env exists mcinitcmd && run mcinitcmd " \ "&& mmc read 0x88000000 0x6800 0x800 " \ "&& fsl_mc lazyapply dpl 0x88000000; " \ - "run distro_bootcmd;env exists secureboot " \ - "&& esbc_halt;run sd_bootcmd;" + "run distro_bootcmd;run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" #else /* Try to boot an on-NOR kernel first, then do normal distro boot */ #define CONFIG_BOOTCOMMAND \ "env exists mcinitcmd && env exists secureboot "\ "&& esbc_validate 0x580780000; env exists mcinitcmd "\ "&& fsl_mc lazyapply dpl 0x580d00000;" \ - "run distro_bootcmd; env exists secureboot " \ - "&& esbc_halt; run nor_bootcmd;" + "run distro_bootcmd;run nor_bootcmd; " \ + "env exists secureboot && esbc_halt;" #endif

/* MAC/PHY configuration */