aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Schmelzer2019-08-22 15:41:44 +0200
committerTom Rini2019-08-25 20:58:59 -0400
commit2c24a83b04e612065865ed93356837da8b0d6029 (patch)
treee29fd608fae26557bece76513d6bd743ce89798f
parentabf9e5d0f2cd123951dfae0d5605b54394721b97 (diff)
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>
-rw-r--r--include/configs/mt7629.h4
-rw-r--r--include/configs/ti_armv7_keystone2.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 6e9b868aa49..fc69d61918a 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 5fd8f386004..7e1d2eb7acb 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