[PoC 078/241] global: Migrate CONFIG_KM_UIMAGE_NAME to CFG

Tom Rini
2022-11-20T13:47:29Z

include/configs/km/keymile-common.h | 6 +++---
scripts/config_whitelist.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index b33bf3615e4f..ffcd44d5ef97 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -51,10 +51,10 @@
#endif /* CFG_KM_UBI_PARTITION_NAME_APP */

#ifdef CONFIG_NAND_ECC_BCH
-#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
+#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
#define CFG_KM_ECC_MODE " eccmode=bch"
#else
-#define CONFIG_KM_UIMAGE_NAME "uImage\0"
+#define CFG_KM_UIMAGE_NAME "uImage\0"
#define CFG_KM_ECC_MODE
#endif

@@ -124,7 +124,7 @@
"cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \
"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \
"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \
- "uimage=" CONFIG_KM_UIMAGE_NAME \
+ "uimage=" CFG_KM_UIMAGE_NAME \
CFG_KM_DEV_ENV_FLASH_BOOT_UBI

/*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e5eeb35bfec4..2b4db3778e20 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -86,7 +86,7 @@ CFG_KM_UBI_LINUX_MTD
CFG_KM_UBI_PARTITION_NAME_APP
CFG_KM_UBI_PARTITION_NAME_BOOT
CFG_KM_UBI_PART_BOOT_OPTS
-CONFIG_KM_UIMAGE_NAME
+CFG_KM_UIMAGE_NAME
CONFIG_KSNET_CPSW_NUM_PORTS
CONFIG_KSNET_MAC_ID_BASE
CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
--
2.25.1