Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 13616fcf7372edf8aae1dab7309ffc7cd876d7b6

Authored by Biwen Li
Committed by Priyanka Jain
1 parent f68461d3be
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

configs: ls1046aqds: support distro boot 

Add support of distro boot for ls1046aqds

Signed-off-by: Biwen Li <biwen.li@nxp.com>

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

include/configs/ls1046a_common.h
Diff comments   View file @ 13616fc
... ... @@ -218,6 +218,10 @@
218 218 #define LS1046A_BOOT_SRC_AND_HDR\
219 219 "boot_scripts=ls1046afrwy_boot.scr\0" \
220 220 "boot_script_hdr=hdr_ls1046afrwy_bs.out\0"
  221 +#elif defined(CONFIG_TARGET_LS1046AQDS)
  222 +#define LS1046A_BOOT_SRC_AND_HDR\
  223 + "boot_scripts=ls1046aqds_boot.scr\0" \
  224 + "boot_script_hdr=hdr_ls1046aqds_bs.out\0"
221 225 #else
222 226 #define LS1046A_BOOT_SRC_AND_HDR\
223 227 "boot_scripts=ls1046ardb_boot.scr\0" \
... ... @@ -231,7 +235,7 @@
231 235 "ramdisk_size=0x2000000\0" \
232 236 "bootm_size=0x10000000\0" \
233 237 "fdt_addr=0x64f00000\0" \
234   - "kernel_addr=0x65000000000000\0" \" \
  238 + "kernel_addr=0x61000000000000\0" \" \
235 239 "scriptaddr=0x80000000\0" \
236 240 "scripthdraddr=0x80080000\0" \
237 241 "fdtheader_addr_r=0x80100000\0" \
... ... @@ -278,6 +282,18 @@
278 282 "&& sf read $kernelheader_addr_r $kernelheader_start " \
279 283 "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
280 284 "bootm $load_addr#$board\0" \
  285 + "nand_bootcmd=echo Trying load from nand..;" \
  286 + "nand info; nand read $load_addr " \
  287 + "$kernel_start $kernel_size; env exists secureboot " \
  288 + "&& nand read $kernelheader_addr_r $kernelheader_start " \
  289 + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
  290 + "bootm $load_addr#$board\0" \
  291 + "nor_bootcmd=echo Trying load from nor..;" \
  292 + "cp.b $kernel_addr $load_addr " \
  293 + "$kernel_size; env exists secureboot " \
  294 + "&& cp.b $kernelheader_addr $kernelheader_addr_r " \
  295 + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
  296 + "bootm $load_addr#$board\0" \
281 297 "sd_bootcmd=echo Trying load from SD ..;" \
282 298 "mmcinfo; mmc read $load_addr " \
283 299 "$kernel_addr_sd $kernel_size_sd && " \
include/configs/ls1046aqds.h
Diff comments   View file @ 13616fc
... ... @@ -421,19 +421,27 @@
421 421  
422 422 #undef CONFIG_BOOTCOMMAND
423 423 #ifdef CONFIG_TFABOOT
424   -#define QSPI_NOR_BOOTCOMMAND "sf probe && sf read $kernel_load " \
425   - "e0000 f00000 && bootm $kernel_load"
426   -#define IFC_NOR_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \
427   - "$kernel_size && bootm $kernel_load"
428   -#define SD_BOOTCOMMAND "mmc info; mmc read $kernel_load" \
429   - "$kernel_addr_sd $kernel_size_sd && bootm $kernel_load"
  424 +#define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \
  425 + "env exists secureboot && esbc_halt;;"
  426 +#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd" \
  427 + "env exists secureboot && esbc_halt;;"
  428 +#define IFC_NOR_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd; " \
  429 + "env exists secureboot && esbc_halt;;"
  430 +#define SD_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; " \
  431 + "env exists secureboot && esbc_halt;;"
430 432 #else
431   -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
432   -#define CONFIG_BOOTCOMMAND "sf probe && sf read $kernel_load " \
433   - "e0000 f00000 && bootm $kernel_load"
  433 +#if defined(CONFIG_QSPI_BOOT)
  434 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd; " \
  435 + "env exists secureboot && esbc_halt;;"
  436 +#elif defined(CONFIG_NAND_BOOT)
  437 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \
  438 + "env exists secureboot && esbc_halt;;"
  439 +#elif defined(CONFIG_SD_BOOT)
  440 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; " \
  441 + "env exists secureboot && esbc_halt;;"
434 442 #else
435   -#define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \
436   - "$kernel_size && bootm $kernel_load"
  443 +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd; " \
  444 + "env exists secureboot && esbc_halt;;"
437 445 #endif
438 446 #endif
439 447