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
---
doc/README.rockchip | 2 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/ot1200.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pfla02.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3399_common.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/README.rockchip b/doc/README.rockchip index 7d4dc1b..463acd9 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -560,7 +560,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 --- 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 4c93fc6..b745f5c 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -167,7 +167,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 --- 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 b2c1300..8d9bf71 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -115,7 +115,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 --- 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 --- 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 b0415b2..98959ce 100644 --- 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 --- 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 d12696d..edd5532 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -27,7 +27,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 84b474a..a647619 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -30,7 +30,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 6ed7525..bd424c0 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -25,7 +25,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 12ad60d..fc66797 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -39,7 +39,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