[U-Boot,3/5] moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 3
diff mbox series

Message ID 1566481318-16029-4-git-send-email-hannes.schmelzer@br-automation.com
State Accepted
Commit 2c24a83b04e612065865ed93356837da8b0d6029
Delegated to: Tom Rini
Headers show
Series
  • convert CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig
Related show

Commit Message

Hannes Schmelzer Aug. 22, 2019, 1:41 p.m. UTC
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>
---

 include/configs/mt7629.h             | 4 +++-
 include/configs/ti_armv7_keystone2.h | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Comments

Tom Rini Aug. 26, 2019, 1:38 p.m. UTC | #1
On Thu, Aug 22, 2019 at 03:41:44PM +0200, Hannes Schmelzer wrote:

> 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>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 6e9b868..fc69d61 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 03753c5..9144662 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -44,7 +44,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