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 ab3361a7ce468e0b535a973add57a570f4708f45..531a062c9ec8e2ed546ef072b045371d2b993d02 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 07c6409e8fb364811f4236dc4c708d1db2bbd5ca..eedf0dd2f804b299dfe4717ef811f3b30c977b55 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 8ae9eb5a7b831cfa7f692e9ad561676193a83961..7809c4c97485cafa081fb11c2042b8ecb5ddac4b 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 60bac9adc85812045df57a5e23265f060f5ea81a..b2fae878358b7ef3d169aa4940824a46ae06de05 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 96b2ad8e516523ade4be4e7646dba26ee81c276a..d7fafcd333f4af51bb6b86291ebe19144078fa72 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 bf70ea00295497e0c6f739647a467f1c9c2e96f0..bd46a340c3648626623a523b200dc686a674c2e4 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 7dfcccb82bd96e96074c2f4ca5a2dbcf4a85f46d..17ccf8b7418c0604d5d83fb3938a658afc0f38d1 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 f0c82b88cf312ab4ea421701397ad005f0df06d9..02c9214cd8b84fcf6d302e63a9c1d68c95d92db8 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 3a9b85acd8d75484dab4ef02c68acba4c03460ec..ed7e4fb8d9e6a3ade2b8b76f7a453ffc2afe8e0c 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 be55fb73ed04e82736ecfb1543056f29278708d8..9ba516f35d897be8211edad159f84d5124bca05b 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 4a62da3ef71ecffe3bae5d1e93c701d98138137c..ad367ed336a481620af6af0397b55c834e158f3e 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 f8b56bae4f93162ab6ad625a1842ca0de9ede718..2dfd952eb63c6f7eeff052c616fbdac5292dece9 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 a5e69b26ad0e8d19de70e16423711c2f2486f954..355850e640b4bc33696984ef0a470e7f66474943 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