Commit eb86dd583476e310319df7429b0f13b331526410

Authored by Biwen Li
Committed by Priyanka Jain
1 parent cb082cf906

configs: ls1088aqds: add COMMON_ENV to fix distroboot

Add COMMON_ENV(kernel_addr_r, fdt_addr_r and so on)
to fix a bug that faild to boot to ubuntu, failed
log as follows,
	## Executing script at 80000000
	load - load binary file from a filesystemUsage:
	load <interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]
	    - Load binary file filename from partition part on device
	       type interface instance dev to address addr in memory.
	      bytes gives the size to load in bytes.
	      If bytes is 0 or omitted, the file is read until the end.
	      pos gives the file byte position to start reading from.
	      If pos is 0 or omitted, the file is read from the start.
	...
	Bad Linux ARM64 Image magic!
	SCRIPT FAILED: continuing...

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

Showing 1 changed file with 12 additions and 0 deletions Side-by-side Diff

include/configs/ls1088aqds.h
... ... @@ -384,10 +384,18 @@
384 384 #define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \
385 385 QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
386 386  
  387 +#define COMMON_ENV \
  388 + "kernelheader_addr_r=0x80200000\0" \
  389 + "fdtheader_addr_r=0x80100000\0" \
  390 + "kernel_addr_r=0x81000000\0" \
  391 + "fdt_addr_r=0x90000000\0" \
  392 + "load_addr=0xa0000000\0"
  393 +
387 394 /* Initial environment variables */
388 395 #ifdef CONFIG_NXP_ESBC
389 396 #undef CONFIG_EXTRA_ENV_SETTINGS
390 397 #define CONFIG_EXTRA_ENV_SETTINGS \
  398 + COMMON_ENV \
391 399 "hwconfig=fsl_ddr:bank_intlv=auto\0" \
392 400 "loadaddr=0x90100000\0" \
393 401 "kernel_addr=0x100000\0" \
... ... @@ -419,6 +427,7 @@
419 427  
420 428 #undef CONFIG_EXTRA_ENV_SETTINGS
421 429 #define CONFIG_EXTRA_ENV_SETTINGS \
  430 + COMMON_ENV \
422 431 "hwconfig=fsl_ddr:bank_intlv=auto\0" \
423 432 "loadaddr=0x90100000\0" \
424 433 "kernel_addr=0x100000\0" \
... ... @@ -480,6 +489,7 @@
480 489 #if defined(CONFIG_QSPI_BOOT)
481 490 #undef CONFIG_EXTRA_ENV_SETTINGS
482 491 #define CONFIG_EXTRA_ENV_SETTINGS \
  492 + COMMON_ENV \
483 493 "hwconfig=fsl_ddr:bank_intlv=auto\0" \
484 494 "loadaddr=0x90100000\0" \
485 495 "kernel_addr=0x100000\0" \
... ... @@ -497,6 +507,7 @@
497 507 #elif defined(CONFIG_SD_BOOT)
498 508 #undef CONFIG_EXTRA_ENV_SETTINGS
499 509 #define CONFIG_EXTRA_ENV_SETTINGS \
  510 + COMMON_ENV \
500 511 "hwconfig=fsl_ddr:bank_intlv=auto\0" \
501 512 "loadaddr=0x90100000\0" \
502 513 "kernel_addr=0x800\0" \
... ... @@ -514,6 +525,7 @@
514 525 #else /* NOR BOOT */
515 526 #undef CONFIG_EXTRA_ENV_SETTINGS
516 527 #define CONFIG_EXTRA_ENV_SETTINGS \
  528 + COMMON_ENV \
517 529 "hwconfig=fsl_ddr:bank_intlv=auto\0" \
518 530 "loadaddr=0x90100000\0" \
519 531 "kernel_addr=0x100000\0" \