From: Hannes Schmelzer Date: Thu, 22 Aug 2019 13:41:44 +0000 (+0200) Subject: moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 3 X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2c24a83b04e612065865ed93356837da8b0d6029;p=u-boot.git moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 3 Exact two boards are referencing CONFIG_SYS_SPI_U_BOOT_OFFS to another define, we replace this manually with the value for having a clean run of moveconfig.py afterwards. Signed-off-by: Hannes Schmelzer --- diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 6e9b868aa4..fc69d61918 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -38,7 +38,9 @@ #define CONFIG_SPL_PAD_TO 0x10000 #define CONFIG_SPI_ADDR 0x30000000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS CONFIG_SPL_PAD_TO +#ifdef CONFIG_SPL_SPI_LOAD +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 +#endif #define CONFIG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO) /* SPL -> Uboot */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 5fd8f38600..7e1d2eb7ac 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -43,7 +43,9 @@ CONFIG_SYS_SPL_MALLOC_SIZE + \ SPL_MALLOC_F_SIZE + \ KEYSTONE_SPL_STACK_SIZE - 4) -#define CONFIG_SYS_SPI_U_BOOT_OFFS CONFIG_SPL_PAD_TO +#ifdef CONFIG_SPL_SPI_LOAD +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 +#endif /* SRAM scratch space entries */ #define SRAM_SCRATCH_SPACE_ADDR CONFIG_SPL_STACK + 0x8