[U-Boot] [Patch v2 2/3] armv8: ls1088aqds: Memory Map modification of kernel, mc, dpl, dpc.

[Amrita Kumari]

This patch adjusts memory map for images on LS1088AQDS,
as per below memory map for NOR flash:
  Image                               Flash Offset
  RCW+PBI                             0x00000000
  Boot firmware (U-Boot)              0x00100000
  Boot firmware Environment           0x00300000
  PPA firmware                        0x00400000
  DPAA2 MC                            0x00A00000
  DPAA2 DPL                           0x00D00000
  DPAA2 DPC                           0x00E00000
  Kernel.itb                          0x01000000

Signed-off-by: Amrita Kumari <amrita.kumari at nxp.com>
---
 include/configs/ls1088aqds.h | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 3b7cd8a..416b8a3 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -21,18 +21,18 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #if defined(CONFIG_SD_BOOT)
-#define CONFIG_ENV_OFFSET		(2 * 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		0x200000        /* 2MB */
+#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000
 #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
@@ -368,13 +368,13 @@ unsigned long get_board_ddr_clk(void);
 	"ramdisk_size=0x2000000\0"		\
 	"fdt_high=0xa0000000\0"			\
 	"initrd_high=0xffffffffffffffff\0"	\
-	"kernel_start=0x1100000\0"		\
+	"kernel_start=0x1000000\0"		\
 	"kernel_load=0xa0000000\0"		\
 	"kernel_size=0x2800000\0"		\
-	"mcinitcmd=sf probe 0:0;sf read 0xa0300000 0x300000 0x100000;"	  \
-	"sf read 0xa0c80000 0xc80000 0x100000; esbc_validate 0xa0c80000;" \
-	"sf read 0xa0800000 0x800000 0x100000;"	\
-	"sf read 0xa0cc0000 0xcc0000 0x100000;esbc_validate 0xa0cc0000;"  \
+	"mcinitcmd=sf probe 0:0;sf read 0xa0300000 0xA00000 0x100000;"	  \
+	"sf read 0xa0700000 0x700000 0x100000; esbc_validate 0xa0700000;" \
+	"sf read 0xa0800000 0xE00000 0x100000;"	\
+	"sf read 0xa0740000 0x740000 0x100000;esbc_validate 0xa0740000;"  \
 	"fsl_mc start mc 0xa0300000 0xa0800000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else /* if !(CONFIG_SECURE_BOOT) */
@@ -387,11 +387,11 @@ unsigned long get_board_ddr_clk(void);
 	"ramdisk_size=0x2000000\0"		\
 	"fdt_high=0xa0000000\0"			\
 	"initrd_high=0xffffffffffffffff\0"	\
-	"kernel_start=0x1100000\0"		\
+	"kernel_start=0x1000000\0"		\
 	"kernel_load=0xa0000000\0"		\
 	"kernel_size=0x2800000\0"		\
-	"mcinitcmd=sf probe 0:0;sf read 0x80000000 0x300000 0x100000;"	\
-	"sf read 0x80100000 0x800000 0x100000;" \
+	"mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"	\
+	"sf read 0x80100000 0xE00000 0x100000;" \
 	"fsl_mc start mc 0x80000000 0x80100000\0"	\
 	"mcmemsize=0x70000000 \0"
 #endif /* CONFIG_SECURE_BOOT */
@@ -405,11 +405,11 @@ unsigned long get_board_ddr_clk(void);
         "ramdisk_size=0x2000000\0"              \
         "fdt_high=0xa0000000\0"                 \
         "initrd_high=0xffffffffffffffff\0"      \
-        "kernel_start=0x8800\0"              \
+        "kernel_start=0x8000\0"              \
         "kernel_load=0xa0000000\0"              \
         "kernel_size=0x14000\0"               \
-        "mcinitcmd=mmcinfo;mmc read 0x80000000 0x1800 0x800;"  \
-        "mmc read 0x80100000 0x4000 0x800;" \
+        "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;"  \
+        "mmc read 0x80100000 0x7000 0x800;" \
         "fsl_mc start mc 0x80000000 0x80100000\0"       \
         "mcmemsize=0x70000000 \0"
 
@@ -423,12 +423,10 @@ unsigned long get_board_ddr_clk(void);
 	"ramdisk_size=0x2000000\0"		\
 	"fdt_high=0xa0000000\0"			\
 	"initrd_high=0xffffffffffffffff\0"	\
-	"kernel_start=0x1100000\0"		\
+	"kernel_start=0x1000000\0"		\
 	"kernel_load=0xa0000000\0"		\
 	"kernel_size=0x2800000\0"		\
-	"mcinitcmd=fsl_mc start mc 0x580300000 0x580800000\0"	\
-	"sf read 0x80100000 0x800000 0x100000;" \
-	"fsl_mc start mc 0x80000000 0x80100000\0"	\
+	"mcinitcmd=fsl_mc start mc 0x580A00000 0x580E00000\0"	\
 	"mcmemsize=0x70000000 \0"
 #endif
 
-- 
2.7.4