From 76ff3f0a3d31596941fa5bd95173eba808a266a9 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 7 Dec 2018 16:19:42 +1300 Subject: [PATCH 1/3] ARM: mvebu: define CONFIG_BLK for db-88f6820-amc db-88f6820-amc uses CONFIG_DM_USB and CONFIG_USB_STORAGE already so define CONFIG_BLK to prepare it for full conversion to DM. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- configs/db-88f6820-amc_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index dd58198a54..9068a58406 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -43,6 +43,9 @@ CONFIG_EFI_PARTITION=y CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_BLK=y +# CONFIG_SPL_BLK is not set +# CONFIG_BLOCK_CACHE is not set CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set From 1670a154f5f4845c3dc646fd505cd01083ad6683 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 14 Dec 2018 16:27:57 +1300 Subject: [PATCH 2/3] ARM: mvebu: remove out of date comment The Marvell DDR3 training code is now part of the U-Boot SPL so the comment saying it needs porting is no longer correct. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- arch/arm/mach-mvebu/cpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index aa1be8ebab..919d05c88c 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -283,10 +283,8 @@ int print_cpuinfo(void) * and sets the correct windows sizes and base addresses accordingly. * * These values are set in the scratch registers by the Marvell - * DDR3 training code, which is executed by the BootROM before the - * main payload (U-Boot) is executed. This training code is currently - * only available in the Marvell U-Boot version. It needs to be - * ported to mainline U-Boot SPL at some point. + * DDR3 training code, which is executed by the SPL before the + * main payload (U-Boot) is executed. */ static void update_sdram_window_sizes(void) { From 7a147220c6459aeb7c6b6f7afe4330dcce077c9b Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Wed, 19 Dec 2018 12:08:50 +0800 Subject: [PATCH 3/3] arm: mvebu: configs: helios4: Change U-Boot offset on SPI Flash SPI flash support on Helios4 [1] has been merge to u-boot/master on commit 8cb8c0c6a83bef ("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 Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- include/configs/helios4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 3157225f06..4e98f19a40 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -118,7 +118,7 @@ #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