Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 615bfce5640c1b577f14d95d77f1b46dfd2b500e

Authored by Alison Wang
Committed by York Sun
1 parent 3049a583f3
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

arm: ls1021a: Adjust memory mapping for Flash/SD card on LS1021AQDS/TWR 

This patch is to adjust the memory mapping for FLash/SD card on
LS1021AQDS and LS1021ATWR, such as U-Boot start address on serial
Flash, QE firmware load address and environment address.

Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

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

include/configs/ls1021aqds.h
Diff comments   View file @ 615bfce
... ... @@ -69,7 +69,7 @@
69 69 #endif
70 70  
71 71 #ifdef CONFIG_QSPI_BOOT
72   -#define CONFIG_SYS_TEXT_BASE 0x40010000
  72 +#define CONFIG_SYS_TEXT_BASE 0x40100000
73 73 #endif
74 74  
75 75 #ifdef CONFIG_NAND_BOOT
... ... @@ -498,7 +498,7 @@
498 498 #define CONFIG_FSL_DEVICE_DISABLE
499 499  
500 500  
501   -#define CONFIG_SYS_QE_FW_ADDR 0x600c0000
  501 +#define CONFIG_SYS_QE_FW_ADDR 0x60940000
502 502  
503 503 #ifdef CONFIG_LPUART
504 504 #define CONFIG_EXTRA_ENV_SETTINGS \
505 505  
... ... @@ -549,14 +549,14 @@
549 549 #define CONFIG_ENV_OVERWRITE
550 550  
551 551 #if defined(CONFIG_SD_BOOT)
552   -#define CONFIG_ENV_OFFSET 0x100000
  552 +#define CONFIG_ENV_OFFSET 0x300000
553 553 #define CONFIG_ENV_IS_IN_MMC
554 554 #define CONFIG_SYS_MMC_ENV_DEV 0
555 555 #define CONFIG_ENV_SIZE 0x2000
556 556 #elif defined(CONFIG_QSPI_BOOT)
557 557 #define CONFIG_ENV_IS_IN_SPI_FLASH
558 558 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */
559   -#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
  559 +#define CONFIG_ENV_OFFSET 0x300000 /* 3MB */
560 560 #define CONFIG_ENV_SECT_SIZE 0x10000
561 561 #elif defined(CONFIG_NAND_BOOT)
562 562 #define CONFIG_ENV_IS_IN_NAND
... ... @@ -564,7 +564,7 @@
564 564 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
565 565 #else
566 566 #define CONFIG_ENV_IS_IN_FLASH
567   -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
  567 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
568 568 #define CONFIG_ENV_SIZE 0x2000
569 569 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
570 570 #endif
include/configs/ls1021atwr.h
Diff comments   View file @ 615bfce
... ... @@ -133,7 +133,7 @@
133 133 #endif
134 134  
135 135 #ifdef CONFIG_QSPI_BOOT
136   -#define CONFIG_SYS_TEXT_BASE 0x40010000
  136 +#define CONFIG_SYS_TEXT_BASE 0x40100000
137 137 #endif
138 138  
139 139 #ifndef CONFIG_SYS_TEXT_BASE
... ... @@ -409,7 +409,7 @@
409 409 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
410 410 #endif
411 411  
412   -#define CONFIG_SYS_QE_FW_ADDR 0x600c0000
  412 +#define CONFIG_SYS_QE_FW_ADDR 0x60940000
413 413  
414 414 /*
415 415 * Environment
416 416  
417 417  
... ... @@ -417,18 +417,18 @@
417 417 #define CONFIG_ENV_OVERWRITE
418 418  
419 419 #if defined(CONFIG_SD_BOOT)
420   -#define CONFIG_ENV_OFFSET 0x100000
  420 +#define CONFIG_ENV_OFFSET 0x300000
421 421 #define CONFIG_ENV_IS_IN_MMC
422 422 #define CONFIG_SYS_MMC_ENV_DEV 0
423 423 #define CONFIG_ENV_SIZE 0x20000
424 424 #elif defined(CONFIG_QSPI_BOOT)
425 425 #define CONFIG_ENV_IS_IN_SPI_FLASH
426 426 #define CONFIG_ENV_SIZE 0x2000
427   -#define CONFIG_ENV_OFFSET 0x100000
  427 +#define CONFIG_ENV_OFFSET 0x300000
428 428 #define CONFIG_ENV_SECT_SIZE 0x10000
429 429 #else
430 430 #define CONFIG_ENV_IS_IN_FLASH
431   -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
  431 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
432 432 #define CONFIG_ENV_SIZE 0x20000
433 433 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
434 434 #endif