summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorShengzhou Liu <Shengzhou.Liu@nxp.com>2017-11-09 17:57:56 +0800
committerYork Sun <york.sun@nxp.com>2017-11-15 10:56:22 -0800
commitaab2ef9aa8ee8e91e36ae66f00cfd1b191174098 (patch)
tree04d3cac0790d266c4dd3756a5ad1452475029957 /include
parent1c8263deb6d90e6088db510254889b22215ce4fd (diff)
armv8: ls1046ardb: Add sd_bootcmd for distro fallback in case of sdboot
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/ls1046a_common.h11
-rw-r--r--include/configs/ls1046ardb.h5
2 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index eea54c7ae2..11f2a28743 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -227,6 +227,8 @@
"kernel_start=0x1000000\0" \
"kernel_load=0xa0000000\0" \
"kernel_size=0x2800000\0" \
+ "kernel_addr_sd=0x8000\0" \
+ "kernel_size_sd=0x14000\0" \
"console=ttyS0,115200\0" \
CONFIG_MTDPARTS_DEFAULT "\0" \
BOOTENV \
@@ -257,12 +259,13 @@
"${scripthdraddr} ${prefix}${boot_script_hdr} " \
"&& esbc_validate ${scripthdraddr};" \
"source ${scriptaddr}\0" \
- "installer=load mmc 0:2 $load_addr " \
- "/flex_installer_arm64.itb; " \
- "bootm $load_addr#ls1046ardb\0" \
"qspi_bootcmd=echo Trying load from qspi..;" \
"sf probe && sf read $load_addr " \
- "$kernel_start $kernel_size && bootm $load_addr#$board\0"
+ "$kernel_start $kernel_size && 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"
#endif
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 87d6c81067..d001b80270 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -225,8 +225,13 @@
#ifndef SPL_NO_MISC
#undef CONFIG_BOOTCOMMAND
+#if defined(CONFIG_QSPI_BOOT)
#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
"&& esbc_halt; run qspi_bootcmd;"
+#elif defined(CONFIG_SD_BOOT)
+#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
+ "&& esbc_halt; run sd_bootcmd;"
+#endif
#endif
#include <asm/fsl_secure_boot.h>