Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit aab2ef9aa8ee8e91e36ae66f00cfd1b191174098

Authored by Shengzhou Liu
Committed by York Sun
1 parent 1c8263deb6
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 2 changed files with 12 additions and 4 deletions Side-by-side Diff

include/configs/ls1046a_common.h
Diff comments   View file @ aab2ef9
... ... @@ -227,6 +227,8 @@
227 227 "kernel_start=0x1000000\0" \
228 228 "kernel_load=0xa0000000\0" \
229 229 "kernel_size=0x2800000\0" \
  230 + "kernel_addr_sd=0x8000\0" \
  231 + "kernel_size_sd=0x14000\0" \
230 232 "console=ttyS0,115200\0" \
231 233 CONFIG_MTDPARTS_DEFAULT "\0" \
232 234 BOOTENV \
233 235  
... ... @@ -257,12 +259,13 @@
257 259 "${scripthdraddr} ${prefix}${boot_script_hdr} " \
258 260 "&& esbc_validate ${scripthdraddr};" \
259 261 "source ${scriptaddr}\0" \
260   - "installer=load mmc 0:2 $load_addr " \
261   - "/flex_installer_arm64.itb; " \
262   - "bootm $load_addr#ls1046ardb\0" \
263 262 "qspi_bootcmd=echo Trying load from qspi..;" \
264 263 "sf probe && sf read $load_addr " \
265   - "$kernel_start $kernel_size && bootm $load_addr#$board\0"
  264 + "$kernel_start $kernel_size && bootm $load_addr#$board\0" \
  265 + "sd_bootcmd=echo Trying load from SD ..;" \
  266 + "mmcinfo; mmc read $load_addr " \
  267 + "$kernel_addr_sd $kernel_size_sd && " \
  268 + "bootm $load_addr#$board\0"
266 269  
267 270 #endif
268 271  
include/configs/ls1046ardb.h
Diff comments   View file @ aab2ef9
... ... @@ -225,8 +225,13 @@
225 225  
226 226 #ifndef SPL_NO_MISC
227 227 #undef CONFIG_BOOTCOMMAND
  228 +#if defined(CONFIG_QSPI_BOOT)
228 229 #define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
229 230 "&& esbc_halt; run qspi_bootcmd;"
  231 +#elif defined(CONFIG_SD_BOOT)
  232 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
  233 + "&& esbc_halt; run sd_bootcmd;"
  234 +#endif
230 235 #endif
231 236  
232 237 #include <asm/fsl_secure_boot.h>