From: Masahiro Yamada Date: Mon, 10 Sep 2018 03:58:33 +0000 (+0900) Subject: ARM: uniphier: increase CONFIG_SYS_MONITOR_LEN again X-Git-Tag: v2018.11-rc1~149^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a4bd3a095b2680b0012b3b62c5d89e6731747fc;p=oweals%2Fu-boot.git 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 --- diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 21ed1d368a..ff44749133 100644 --- 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