summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-02-22 19:00:08 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-15 22:43:35 +0900
commit27fbdcdefd87411e12c1d1caac1019d2b37a9eb7 (patch)
tree8fb071aa951000a713f9855caeb8c7f8fe42829b
parent34be347999503b61708f1c50d07c9a72dab69478 (diff)
ARM: uniphier: change load addresses for bigger kernel image
The kernel size is getting bigger and bigger. Because the Android common kernel is even bigger than the vanilla one, so images overlap in the current memory layout. Adjust the load address for a bigger kernel image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--include/configs/uniphier.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 6a25dbd4a6..a5ce52d3cd 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -87,7 +87,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)
@@ -115,7 +115,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" \
@@ -128,7 +128,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"
@@ -138,15 +138,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 " \