moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 1

Some boards have coded this offset with formula or bitshifts in their
board-config. Manually convert these things into hex-values to be able
using moveconfig.py afterwards.

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

diff --git a/doc/README.rockchip b/doc/README.rockchip
index ab3361a..531a062 100644 (file)
--- a/doc/README.rockchip
+++ b/doc/README.rockchip
@@ -559,7 +559,7 @@ header and skipping every second 2KB block. Then the U-Boot image is written at
 offset 128KB and the whole image is padded to 4MB which is the SPI flash size.
 The position of U-Boot is controlled with this setting in U-Boot:
 
-   #define CONFIG_SYS_SPI_U_BOOT_OFFS  (128 << 10)
+   #define CONFIG_SYS_SPI_U_BOOT_OFFS  0x20000
 
 If you have a Dediprog em100pro connected then you can write the image with:
 

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 07c6409..eedf0dd 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -17,7 +17,7 @@
 #define CONFIG_MACH_TYPE       4122
 
 #ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #include "imx6_spl.h"
 #endif
 

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 8ae9eb5..7809c4c 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -166,7 +166,7 @@
 /* SPL */
 #include "imx7_spl.h"
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #endif /* CONFIG_SPL_BUILD */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 60bac9a..b2fae87 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -207,7 +207,7 @@
 
 /* SPL */
 #include "imx6_spl.h"
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 
 /* Display */
 #define CONFIG_IMX_HDMI

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 96b2ad8..d7fafcd 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -114,7 +114,7 @@
 
 /* SPL defines. */
 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + (128 << 20))
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (256 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 
 /* EEPROM */

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index bf70ea0..bd46a34 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -20,7 +20,7 @@
 #define CONFIG_MXC_UART
 
 #ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #include "imx6_spl.h"
 #endif
 

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 7dfcccb..17ccf8b 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -59,7 +59,7 @@
 /* SPL */
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #endif
 
 #define CONFIG_FEC_MXC

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index f0c82b8..02c9214 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -8,7 +8,7 @@
 #define __PCM058_CONFIG_H
 
 #ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #include "imx6_spl.h"
 #endif
 

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 3a9b85a..ed7e4fb 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -8,7 +8,7 @@
 #define __PCM058_CONFIG_H
 
 #ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 #include "imx6_spl.h"
 #endif
 

diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index be55fb7..9ba516f 100644 (file)
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -26,7 +26,7 @@
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
 /* RAW SD card / eMMC locations. */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 #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 4a62da3..ad367ed 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -29,7 +29,7 @@
 #define CONFIG_IRAM_BASE               0xff700000
 
 /* RAW SD card / eMMC locations. */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 /* 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 f8b56ba..2dfd952 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -24,7 +24,7 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 /* 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 a5e69b2..355850e 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -38,7 +38,7 @@
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
 
 /* RAW SD card / eMMC locations. */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1