]> git.baikalelectronics.ru Git - uboot.git/commitdiff
arm: mvebu: configs: helios4: Change U-Boot offset on SPI Flash
authorAditya Prayoga <aditya@kobol.io>
Wed, 19 Dec 2018 04:08:50 +0000 (12:08 +0800)
committerStefan Roese <sr@denx.de>
Fri, 21 Dec 2018 07:59:19 +0000 (08:59 +0100)
SPI flash support on Helios4 [1] has been merge to u-boot/master on
commit b6ca6c10a8776b ("Merge git://git.denx.de/u-boot-marvell")

However, the SPI image build failed after the merge with following
message:

COPY    spl/u-boot-spl.bin
MKIMAGE u-boot-spl.kwb
Error: Image header (incl. SPL image) too big!
header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000!
Increase CONFIG_SYS_U_BOOT_OFFS!
Error: Image header (incl. SPL image) too big!
header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000!
Increase CONFIG_SYS_U_BOOT_OFFS!
Could not create image
Makefile:1162: recipe for target 'u-boot-spl.kwb' failed
make: *** [u-boot-spl.kwb] Error 1

Let's increase the u-boot offset to 0x30000 to accommodate SPL changes
and leave some margin for future changes.

[1] https://patchwork.ozlabs.org/patch/1007762/

Signed-off-by: Aditya Prayoga <aditya@kobol.io>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
include/configs/helios4.h

index 3157225f06776240a439ba9a818ca7341a07c5b8..4e98f19a403545496b6b90a9a7466c67422f9700 100644 (file)
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_SPI_SUPPORT
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x30000
 #define CONFIG_SYS_U_BOOT_OFFS         CONFIG_SYS_SPI_U_BOOT_OFFS
 #endif