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 <hannes.schmelzer@br-automation.com>

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 6e9b868aa49054ef6231df27b29c2ba7ff580e4c..fc69d61918af7ea7c81ee838659c31d7b86d03e6 100644 (file)
--- 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 5fd8f386004f17d6dacb9f308c73eb3c7b745527..7e1d2eb7acbf8706bad2b976daba4531b80a0234 100644 (file)
--- 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