diff options
| author | Shengzhou Liu <Shengzhou.Liu@nxp.com> | 2017-08-07 07:06:47 (GMT) |
|---|---|---|
| committer | Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> | 2017-09-03 10:03:05 (GMT) |
| commit | 0e21873e4c3be2a37986b7105715611cfc86bd01 (patch) | |
| tree | 486e7814fd0c9a8ff9babd2034264915c2cf567a | |
| parent | 6a240aef1664214d40a15a45088b0ca06e76f4c2 (diff) | |
| download | u-boot-0e21873e4c3be2a37986b7105715611cfc86bd01.tar.xz | |
arm64: ls1046ardb: Add sd_bootcmd for distro fallback in case of sdboot
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
| -rw-r--r-- | include/configs/ls1046a_common.h | 8 | ||||
| -rw-r--r-- | include/configs/ls1046ardb.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 5a25232..d02daf7 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -232,6 +232,8 @@ "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \ "kernelheader_size=0x40000\0" \ + "kernel_addr_sd=0x8000\0" \ + "kernel_size_sd=0x14000\0" \ "console=ttyS0,115200\0" \ MTDPARTS_DEFAULT "\0" \ BOOTENV \ @@ -270,7 +272,11 @@ "$kernel_start $kernel_size; env exists secureboot " \ "&& sf read $kernelheader_addr_r $kernelheader_start " \ "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ - "bootm $load_addr#$board\0" + "bootm $load_addr#$board\0" \ + "sd_bootcmd=echo Trying load from SD ..;" \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd ;" \ + " bootm $load_addr#$board\0" #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 7bdff82..f8c15a6 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -243,8 +243,14 @@ #ifndef SPL_NO_MISC #undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ +#if defined(CONFIG_QSPI_BOOT) +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;" +#elif defined(CONFIG_SD_BOOT) +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#endif + #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \ |