From 58d702274c09c8dc45c14141acd2c70bb578c5b2 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 20 Apr 2018 17:42:29 +0900 Subject: ARM: uniphier: increase CONFIG_SYS_MONITOR_LEN With the recent changes, the size of the U-Boot proper image for uniphier_v7_defconfig exceeded the current limit, 512KB, then SPL fails to load the whole of the U-Boot proper. Increase the size. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 1b4140de065..a00bfd97bd8 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_MONITOR_BASE 0 -#define CONFIG_SYS_MONITOR_LEN 0x00080000 /* 512KB */ +#define CONFIG_SYS_MONITOR_LEN 0x00090000 /* 576KB */ #define CONFIG_SYS_FLASH_BASE 0 /* -- cgit v1.2.3 From fbe73dc88de4311f989b9d3c00b5cba9a2c5acb4 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 20 Apr 2018 18:38:27 +0900 Subject: ARM: uniphier: select a correct mmc device before flashing images Some boards support an SD card and an eMMC device at the same time. Since both belong to 'mmc', they are identified by a device number. When the device number of the eMMC is 1 instead 0, "mmc dev" command must be performed to switch the target device before flashing images. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index a00bfd97bd8..42c51fb4a21 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -186,6 +186,7 @@ "setexpr tmp_addr $nor_base + 0x70000 && " \ "tftpboot $tmp_addr $third_image\0" \ "emmcupdate=mmcsetn &&" \ + "mmc dev $mmc_first_dev &&" \ "mmc partconf $mmc_first_dev 0 1 1 &&" \ "tftpboot $second_image && " \ "mmc write $loadaddr 0 100 && " \ -- cgit v1.2.3 From 3ce5b1a8d86d46f4a390e31e52b7ba441fdb229e Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 23 Apr 2018 15:10:51 +0900 Subject: ARM: uniphier: move SPL stack address Currently, the address region, 0xf8000 - 0x100000, is used for SPL stack for the 32bit SoCs. Because the U-Boot proper image starts from 0x70000, the maximum size of the U-Boot proper image is 544KB (0x70000 - 0xf8000) for the NOR boot mode. Now uniphier_v7_defconfig is almost hitting this size limit. Changing CONFIG_SPL_STACK can raise the size limit with less impact. With this, the size limit will increase to 576KB (0x70000 - 0x100000). If we need to increase it even more, we would be able to change CONFIG_SYS_UBOOT_BASE at the cost of the flashing command changes. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 42c51fb4a21..c39f13bf6bf 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -220,7 +220,7 @@ #define CONFIG_SPL_TEXT_BASE 0x00100000 #endif -#define CONFIG_SPL_STACK (0x00100000) +#define CONFIG_SPL_STACK (0x00200000) #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 -- cgit v1.2.3