ARM: uniphier: increase CONFIG_SYS_MONITOR_LEN again

With the migration to distro-boot, the size of the U-Boot proper
image for uniphier_v7_defconfig exceeded the current limit, 576KB.
Increase it to 832KB.

CONFIG_SYS_UBOOT_BASE must be moved as well to avoid the image
over-wrap because the boot ROM of Pro4, Pro5, PXs2/LD6b loads
the SPL to the physical address 0x100000.

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 21ed1d368a5a4b4ba3c451e687fa407b5d4b3d3f..ff447491331084a176ee6c013506a0e55b1d720e 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -60,7 +60,7 @@
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 #define CONFIG_SYS_MONITOR_BASE                0
-#define CONFIG_SYS_MONITOR_LEN         0x00090000      /* 576KB */
+#define CONFIG_SYS_MONITOR_LEN         0x000d0000      /* 832KB */
 #define CONFIG_SYS_FLASH_BASE          0
 
 /*
@@ -218,7 +218,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
 /* subtract sizeof(struct image_header) */
-#define CONFIG_SYS_UBOOT_BASE                  (0x70000 - 0x40)
+#define CONFIG_SYS_UBOOT_BASE                  (0x130000 - 0x40)
 
 #define CONFIG_SPL_TARGET                      "u-boot-with-spl.bin"
 #define CONFIG_SPL_MAX_FOOTPRINT               0x10000