moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 2

some boards have common headers for several individual build-targets
where CONFIG_SYS_SPI_U_BOOT_OFFS is defined even it is not needed (only
needed if CONFIG_SPL_SPI_LOAD is defined also). Take this define here
under '#ifdef CONFIG_SPL_SPI_LOAD' for having a clean run of
moveconfig.py

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index e9b97b6e97e751bf47e30baa2c0239cea7a2d646..2abe979dcfc900a5f3a54a36b5cc19d3953e6a4c 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -153,7 +153,7 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #elif CONFIG_SYS_USE_NANDFLASH
-#elif CONFIG_SPI_BOOT
+#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8400
 
 #elif CONFIG_NAND_BOOT

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 9353de76f2873ee89d841e3ac40fc60e630ece0e..805682269234084751c89a5ed4969bed32cb3eab 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -125,7 +125,7 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
-#elif CONFIG_SPI_BOOT
+#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8400
 
 #elif CONFIG_NAND_BOOT

diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 9ba516f35d897be8211edad159f84d5124bca05b..dbc7011a6be8f814e2cfdd180878225ccb05d75d 100644 (file)
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -26,7 +26,9 @@
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
 /* RAW SD card / eMMC locations. */
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#endif
 
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0x60000000

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index ad367ed336a481620af6af0397b55c834e158f3e..9648e34539d490b454a6e917332ebcb4a39bd072 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -29,7 +29,9 @@
 #define CONFIG_IRAM_BASE               0xff700000
 
 /* RAW SD card / eMMC locations. */
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#endif
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1

diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 2dfd952eb63c6f7eeff052c616fbdac5292dece9..394ee3ef1093dd8b66e0c0ba6fbb54a3dc88176c 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -24,7 +24,9 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#endif
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 355850e640b4bc33696984ef0a470e7f66474943..06d35a01fd0c1ce9f313a7413f5e083555d60c2a 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -38,7 +38,9 @@
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
 
 /* RAW SD card / eMMC locations. */
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#endif
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1

diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h
index 90846c4bfd44597cf083db06293e9e7b52332e5c..7898f4d277b550ed95aced7bddd8b96830e5cf7f 100644 (file)
--- a/include/configs/sama5d27_som1_ek.h
+++ b/include/configs/sama5d27_som1_ek.h
@@ -62,7 +62,7 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 
-#ifdef CONFIG_QSPI_BOOT
+#if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL_SPI_LOAD)
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #endif
 

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index db840e927e61857da0f2a914f15cfe733d1e6310..c5a2e54e08c88ede6041d53cd57c3fdc4c915a09 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -84,7 +84,7 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#elif CONFIG_SPI_BOOT
+#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 
 #elif CONFIG_NAND_BOOT

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 36b0ed54596c6ff150aee0e64a37bb3948d67c0e..4141c7efd30a8df5d38fca028d98bbf882e65908 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -214,9 +214,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 
 /* SPL QSPI boot support */
 #ifdef CONFIG_SPL_SPI_SUPPORT
-#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
+#if defined(CONFIG_TARGET_SOCFPGA_GEN5) && defined(CONFIG_SPL_SPI_LOAD)
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
-#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) && defined(CONFIG_SPL_SPI_LOAD)
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x100000
 #endif
 #endif

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index d7133a73fc20aa7242ed216a6532e9e9203072f0..c5dbf6d83328cfb7f9da052d45ed6c58acc1f843 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -118,7 +118,7 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE 8
 #endif
 
-#ifdef CONFIG_SPL_SPI_SUNXI
+#if defined(CONFIG_SPL_SPI_SUNXI) && defined(CONFIG_SPL_SPI_LOAD)
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8000
 #endif
 

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index b3f4fc506fd91e9a7810f1cdcb93fa4ea89ce18e..364bac03f75f638f629d36aca9400e033682dcbb 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -129,7 +129,9 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
+#endif
 #define CONFIG_SYS_SPI_U_BOOT_SIZE     0x40000
 
 /*

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index bbcb20737b07f5bf00af8e6942d267b4c0b0731a..56500fe868df291b1cc0e7a72d3c425c326dfbf7 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -217,9 +217,10 @@
 # define CONFIG_SYS_SPI_KERNEL_OFFS    0x80000
 # define CONFIG_SYS_SPI_ARGS_OFFS      0xa0000
 # define CONFIG_SYS_SPI_ARGS_SIZE      0xa0000
-
+#ifdef CONFIG_SPL_SPI_LOAD
 # define CONFIG_SYS_SPI_U_BOOT_OFFS    0x170000
 #endif
+#endif
 
 /* u-boot is like dtb */
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME   "u-boot.bin"

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index bb6a835ece0eb0d1b70a729d2447262974775cf6..fd761c2f5dd8e7236c4308c97f27597e6676306a 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -293,7 +293,9 @@
 
 /* qspi mode is working fine */
 #ifdef CONFIG_ZYNQ_QSPI
+#ifdef CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x100000
+#endif
 #define CONFIG_SYS_SPI_ARGS_OFFS       0x200000
 #define CONFIG_SYS_SPI_ARGS_SIZE       0x80000
 #define CONFIG_SYS_SPI_KERNEL_OFFS     (CONFIG_SYS_SPI_ARGS_OFFS + \