[PoC 221/241] global: Migrate CONFIG_UBOOT_SECTOR_COUNT to CFG

Tom Rini
2022-11-20T14:26:26Z

include/configs/xpress.h | 4 ++--
scripts/config_whitelist.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index f8ee40a9543b..2b57ba34be9c 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -35,7 +35,7 @@
#define CFG_FEC_MXC_PHYADDR 0x0

#define CONFIG_UBOOT_SECTOR_START 0x2
-#define CONFIG_UBOOT_SECTOR_COUNT 0x3fe
+#define CFG_UBOOT_SECTOR_COUNT 0x3fe

#define CFG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
@@ -76,7 +76,7 @@
"fi;\0" \
"uboot=ccv/u-boot.imx\0" \
"uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0" \
- "uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0" \
+ "uboot_size="__stringify(CFG_UBOOT_SECTOR_COUNT)"\0" \
"update_uboot=if tftp ${uboot}; then " \
"if itest ${filesize} > 0; then " \
"mmc dev 0 1;" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cd44d281e0ec..a520c70a2baf 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -235,7 +235,7 @@ CFG_TSEC_TBICR_SETTINGS
CFG_UBIFS_VOLUME
CFG_UBI_PART
CFG_UBOOTPATH
-CONFIG_UBOOT_SECTOR_COUNT
+CFG_UBOOT_SECTOR_COUNT
CONFIG_UBOOT_SECTOR_START
CONFIG_UEC_ETH
CONFIG_USART_BASE
--
2.25.1