ARM: uniphier: change load addresses for bigger kernel image

Message ID 1519293608-9114-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 27fbdcdefd87411e12c1d1caac1019d2b37a9eb7
Headers show
Series
  • ARM: uniphier: change load addresses for bigger kernel image
Related show

Commit Message

Masahiro Yamada Feb. 22, 2018, 10 a.m.
The kernel size is getting bigger and bigger.  Because the Android
common kernel is even bigger than the vanilla kernel, so images
overlap with the current memory layout.

Change the load address to adjust for a bigger kernel image.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 include/configs/uniphier.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Masahiro Yamada March 15, 2018, 1:46 p.m. | #1
2018-02-22 19:00 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> The kernel size is getting bigger and bigger.  Because the Android
> common kernel is even bigger than the vanilla kernel, so images
> overlap with the current memory layout.
>
> Change the load address to adjust for a bigger kernel image.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>

Applied to u-boot-uniphier.

Patch

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 9373233..7688234 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -90,7 +90,7 @@ 
 #define CONFIG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
-#define CONFIG_LOADADDR			0x84000000
+#define CONFIG_LOADADDR			0x85000000
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_BOOTM_LEN		(32 << 20)
 
@@ -120,7 +120,7 @@ 
 #define CONFIG_BOOTFILE			"fitImage"
 #define LINUXBOOT_ENV_SETTINGS \
 	"fit_addr=0x00100000\0" \
-	"fit_addr_r=0x84100000\0" \
+	"fit_addr_r=0x85100000\0" \
 	"fit_size=0x00f00000\0" \
 	"norboot=setexpr fit_addr $nor_base + $fit_addr &&" \
 		"bootm $fit_addr\0" \
@@ -133,7 +133,7 @@ 
 #ifdef CONFIG_ARM64
 #define CONFIG_BOOTFILE			"Image.gz"
 #define LINUXBOOT_CMD			"booti"
-#define KERNEL_ADDR_LOAD		"kernel_addr_load=0x84200000\0"
+#define KERNEL_ADDR_LOAD		"kernel_addr_load=0x85200000\0"
 #define KERNEL_ADDR_R			"kernel_addr_r=0x82080000\0"
 #else
 #define CONFIG_BOOTFILE			"zImage"
@@ -143,15 +143,15 @@ 
 #endif
 #define LINUXBOOT_ENV_SETTINGS \
 	"fdt_addr=0x00100000\0" \
-	"fdt_addr_r=0x84100000\0" \
+	"fdt_addr_r=0x85100000\0" \
 	"fdt_size=0x00008000\0" \
 	"kernel_addr=0x00200000\0" \
 	KERNEL_ADDR_LOAD \
 	KERNEL_ADDR_R \
-	"kernel_size=0x00800000\0" \
-	"ramdisk_addr=0x00a00000\0" \
-	"ramdisk_addr_r=0x84a00000\0" \
-	"ramdisk_size=0x00600000\0" \
+	"kernel_size=0x00e00000\0" \
+	"ramdisk_addr=0x01000000\0" \
+	"ramdisk_addr_r=0x86000000\0" \
+	"ramdisk_size=0x00800000\0" \
 	"ramdisk_file=rootfs.cpio.uboot\0" \
 	"boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
 		"if test $kernel_addr_load = $kernel_addr_r; then " \