Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 397a173e9ee50d0517793e662d88856624f1decc

Authored by Shengzhou Liu
Committed by York Sun
1 parent aab2ef9aa8
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

armv7: ls1021atwr: 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 1 changed file with 10 additions and 4 deletions Side-by-side Diff

include/configs/ls1021atwr.h
Diff comments   View file @ 397a173
... ... @@ -375,6 +375,8 @@
375 375 "ramdisk_addr_r=0xa0000000\0" \
376 376 "load_addr=0xa0000000\0" \
377 377 "kernel_size=0x2800000\0" \
  378 + "kernel_addr_sd=0x8000\0" \
  379 + "kernel_size_sd=0x14000\0" \
378 380 BOOTENV \
379 381 "boot_scripts=ls1021atwr_boot.scr\0" \
380 382 "boot_script_hdr=hdr_ls1021atwr_bs.out\0" \
381 383  
382 384  
... ... @@ -456,21 +458,25 @@
456 458 "${scripthdraddr} ${prefix}${boot_script_hdr} " \
457 459 "&& esbc_validate ${scripthdraddr};" \
458 460 "source ${scriptaddr}\0" \
459   - "installer=load mmc 0:2 $load_addr " \
460   - "/flex_installer_arm32.itb; " \
461   - "bootm $load_addr#ls1021atwr\0" \
462 461 "qspi_bootcmd=echo Trying load from qspi..;" \
463 462 "sf probe && sf read $load_addr " \
464 463 "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \
465 464 "nor_bootcmd=echo Trying load from nor..;" \
466 465 "cp.b $kernel_addr $load_addr " \
467   - "$kernel_size && bootm $load_addr#$board\0"
  466 + "$kernel_size && bootm $load_addr#$board\0" \
  467 + "sd_bootcmd=echo Trying load from SD ..;" \
  468 + "mmcinfo && mmc read $load_addr " \
  469 + "$kernel_addr_sd $kernel_size_sd && " \
  470 + "bootm $load_addr#$board\0"
468 471 #endif
469 472  
470 473 #undef CONFIG_BOOTCOMMAND
471 474 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
472 475 #define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
473 476 "&& esbc_halt; run qspi_bootcmd;"
  477 +#elif defined(CONFIG_SD_BOOT)
  478 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
  479 + "&& esbc_halt; run sd_bootcmd;"
474 480 #else
475 481 #define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
476 482 "&& esbc_halt; run nor_bootcmd;"