[PoC 119/241] global: Migrate CONFIG_MIU_2BIT_INTERLEAVED to CFG

Tom Rini
2022-11-20T14:10:34Z

arch/arm/mach-exynos/exynos4_setup.h | 2 +-
include/configs/smdkv310.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h
index fbb45eb897e3..b696206cc855 100644
--- a/arch/arm/mach-exynos/exynos4_setup.h
+++ b/arch/arm/mach-exynos/exynos4_setup.h
@@ -434,7 +434,7 @@ struct mem_timings {
/* Interleave_bit0: 0xC*/
#define APB_SFR_INTERLEAVE_CONF_VAL 0x0000000c
#endif
-#ifdef CONFIG_MIU_2BIT_INTERLEAVED
+#ifdef CFG_MIU_2BIT_INTERLEAVED
/* Interleave: 2Bit, Interleave_bit1: 0x15, Interleave_bit0: 0xc */
#define APB_SFR_INTERLEAVE_CONF_VAL 0x2000150c
#endif
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 1f137dba90f7..00dd929d90e6 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -35,7 +35,7 @@
/* FLASH and environment organization */

/* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_INTERLEAVED
+#define CFG_MIU_2BIT_INTERLEAVED

#define RESERVE_BLOCK_SIZE (512)
#define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8d6af14c3667..b2686806c5c4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -127,7 +127,7 @@ CFG_MEM_INIT_VALUE
CFG_MFG_ENV_SETTINGS
CFG_MII_DEFAULT_TSEC
CFG_MIU_2BIT_21_7_INTERLEAVED
-CONFIG_MIU_2BIT_INTERLEAVED
+CFG_MIU_2BIT_INTERLEAVED
CONFIG_MMC_DEFAULT_DEV
CONFIG_MMC_SUNXI_SLOT
CONFIG_MONITOR_IS_IN_RAM
--
2.25.1