diff mbox

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

Message ID 1493975597-24842-1-git-send-email-amrita.kumari@nxp.com
State Changes Requested
Delegated to: York Sun
Headers show

Commit Message

Amrita Kumari May 5, 2017, 9:13 a.m. UTC 
This patch adjusts memory map for images on LS1088ARDB,
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@nxp.com>
---
 include/configs/ls1088a_common.h | 12 ++++++------
 include/configs/ls1088ardb.h     | 34 ++++++++++++++++------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

Comments

York Sun June 13, 2017, 8:28 p.m. UTC | #1 
On 05/05/2017 02:16 AM, Amrita Kumari wrote:
> This patch adjusts memory map for images on LS1088ARDB,
> 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@nxp.com>

First, do not post a patch to both internal and upstream lists in the 
same email.

Second, please squash your patch with the patch adding such boards and 
submit again.

York
diff mbox

Patch

diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index ee79470..323a485 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -179,29 +179,29 @@  unsigned long long get_qixis_addr(void);
 	"ramdisk_size=0x2000000\0"		\
 	"fdt_high=0xa0000000\0"			\
 	"initrd_high=0xffffffffffffffff\0"	\
-	"kernel_start=0x581200000\0"		\
+	"kernel_start=0x581000000\0"		\
 	"kernel_load=0xa0000000\0"		\
 	"kernel_size=0x2800000\0"		\
 	"console=ttyAMA0,38400n8\0"		\
-	"mcinitcmd=fsl_mc start mc 0x580300000"	\
-	" 0x580800000 \0"
+	"mcinitcmd=fsl_mc start mc 0x580a00000"	\
+	" 0x580e00000 \0"
 
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 root=/dev/ram0 " \
 				"earlycon=uart8250,mmio,0x21c0500 " \
 				"ramdisk_size=0x3000000 default_hugepagesz=2m" \
 				" hugepagesz=2m hugepages=256"
 #if defined(CONFIG_QSPI_BOOT)
-#define CONFIG_BOOTCOMMAND	"sf probe 0:0;sf read 0x80200000 0x700000 0x100000;"\
+#define CONFIG_BOOTCOMMAND	"sf probe 0:0;sf read 0x80200000 0xd00000 0x100000;"\
 				" fsl_mc apply dpl 0x80200000 &&" \
 				" sf read $kernel_load $kernel_start" \
 				" $kernel_size && bootm $kernel_load"
 #elif defined(CONFIG_SD_BOOT)
-#define CONFIG_BOOTCOMMAND     "mmcinfo;mmc read 0x80200000 0x3800 0x800;"\
+#define CONFIG_BOOTCOMMAND     "mmcinfo;mmc read 0x80200000 0x6800 0x800;"\
                                " fsl_mc apply dpl 0x80200000 &&" \
                                " mmc read $kernel_load $kernel_start" \
                                " $kernel_size && bootm $kernel_load"
 #else
-#define CONFIG_BOOTCOMMAND	"fsl_mc apply dpl 0x580700000 &&" \
+#define CONFIG_BOOTCOMMAND	"fsl_mc apply dpl 0x580d00000 &&" \
 				" cp.b $kernel_start $kernel_load" \
 				" $kernel_size && bootm $kernel_load"
 #endif
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index e6bbfb8..b2a0da4 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -16,18 +16,18 @@ 
 #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
@@ -299,13 +299,13 @@ 
 	"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) */
@@ -318,11 +318,11 @@ 
 	"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 */
@@ -336,11 +336,11 @@ 
         "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"
 
@@ -355,12 +355,10 @@ 
 	"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