armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1046A

This patch is to adjust the memory mapping for FLash/SD card on
LS1046AQDS and LS1046ARDB, such as FMAN firmware load address, U-Boot
start address on serial flash and environment address.

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

diff --git a/board/freescale/ls1046ardb/README b/board/freescale/ls1046ardb/README
index 1ef7d479a3c9323975ab95107b497c1b6eb167ca..a38c9d48300e96a46987f92daf3d2352727f5d64 100644 (file)
--- a/board/freescale/ls1046ardb/README
+++ b/board/freescale/ls1046ardb/README
@@ -59,14 +59,14 @@ Start Address        End Address     Description            Size
 QSPI flash map:
 Start Address    End Address     Description           Size
 0x00_4000_0000 - 0x00_400F_FFFF  RCW + PBI             1MB
-0x00_4010_0000 - 0x00_401F_FFFF  U-Boot                1MB
-0x00_4020_0000 - 0x00_402F_FFFF  U-Boot Env            1MB
-0x00_4030_0000 - 0x00_403F_FFFF  FMan ucode            1MB
-0x00_4040_0000 - 0x00_404F_FFFF  UEFI                  1MB
-0x00_4050_0000 - 0x00_406F_FFFF  PPA                   2MB
-0x00_4070_0000 - 0x00_408F_FFFF  Secure boot header
-                                + bootscript           2MB
-0x00_4090_0000 - 0x00_40FF_FFFF  Reserved              7MB
+0x00_4010_0000 - 0x00_402F_FFFF  U-Boot                2MB
+0x00_4030_0000 - 0x00_403F_FFFF  U-Boot Env            1MB
+0x00_4040_0000 - 0x00_405F_FFFF  PPA                   2MB
+0x00_4060_0000 - 0x00_408F_FFFF  Secure boot header
+                                + bootscript           3MB
+0x00_4090_0000 - 0x00_4093_FFFF  FMan ucode            256KB
+0x00_4094_0000 - 0x00_4097_FFFF  QE/uQE firmware       256KB
+0x00_4098_0000 - 0x00_40FF_FFFF  Reserved              6MB
 0x00_4100_0000 - 0x00_43FF_FFFF  FIT Image             48MB
 
 Booting Options

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 80f8dc2cbbcfade99c69105cb197d5a25f6defa3..47a544c90c5f0b0f86a809f7621aa039c2d7d22a 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -176,23 +176,23 @@
 /*
  * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
  * about 1MB (2048 blocks), Env is stored after the image, and the env size is
- * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080(0x820).
+ * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 18432(0x4800).
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
-#define CONFIG_SYS_FMAN_FW_ADDR                (512 * 0x820)
+#define CONFIG_SYS_FMAN_FW_ADDR                (512 * 0x4800)
 #elif defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
-#define CONFIG_SYS_FMAN_FW_ADDR                0x40300000
+#define CONFIG_SYS_FMAN_FW_ADDR                0x40900000
 #define CONFIG_ENV_SPI_BUS             0
 #define CONFIG_ENV_SPI_CS              0
 #define CONFIG_ENV_SPI_MAX_HZ          1000000
 #define CONFIG_ENV_SPI_MODE            0x03
 #elif defined(CONFIG_NAND_BOOT)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
-#define CONFIG_SYS_FMAN_FW_ADDR                (6 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#define CONFIG_SYS_FMAN_FW_ADDR                (72 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
-#define CONFIG_SYS_FMAN_FW_ADDR                0x60300000
+#define CONFIG_SYS_FMAN_FW_ADDR                0x60900000
 #endif
 #define CONFIG_SYS_QE_FMAN_FW_LENGTH   0x10000
 #define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 0cf6010a6cd6a6c52a38d0e106fc383b0e512ae8..5d2e819e786e19cc39191c4e83eb3d2014bc34a5 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -12,7 +12,7 @@
 #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT)
 #define CONFIG_SYS_TEXT_BASE           0x82000000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_SYS_TEXT_BASE           0x40010000
+#define CONFIG_SYS_TEXT_BASE           0x40100000
 #else
 #define CONFIG_SYS_TEXT_BASE           0x60100000
 #endif
@@ -447,20 +447,20 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_NAND_BOOT
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_OFFSET              (5 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#define CONFIG_ENV_OFFSET              (24 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SD_BOOT)
-#define CONFIG_ENV_OFFSET              (1024 * 1024)
+#define CONFIG_ENV_OFFSET              (3 * 1024 * 1024)
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_SIZE                        0x2000
 #elif defined(CONFIG_QSPI_BOOT)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                        0x2000          /* 8KB */
-#define CONFIG_ENV_OFFSET              0x100000        /* 1MB */
+#define CONFIG_ENV_OFFSET              0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE           0x10000
 #else
 #define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + 0x200000)
+#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + 0x300000)
 #define CONFIG_ENV_SECT_SIZE           0x20000
 #define CONFIG_ENV_SIZE                        0x20000
 #endif

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 7161ee8dd4898197dd653560bb7b453bdddc24f3..6f649a62232674401514d04f16bc86ac1ec1f122 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -169,12 +169,12 @@
 #if defined(CONFIG_SD_BOOT)
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_OFFSET              (1024 * 1024)
+#define CONFIG_ENV_OFFSET              (3 * 1024 * 1024)
 #define CONFIG_ENV_SIZE                        0x2000
 #else
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                        0x2000          /* 8KB */
-#define CONFIG_ENV_OFFSET              0x200000        /* 2MB */
+#define CONFIG_ENV_OFFSET              0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE           0x40000         /* 256KB */
 #endif