Signed-off-by: Tom Rini trini@konsulko.com --- board/sunxi/board.c | 4 ++-- include/configs/sunxi-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 21a2407e062f..356e5f07f688 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -526,8 +526,8 @@ static void mmc_pinmux_setup(int sdc) int board_mmc_init(struct bd_info *bis) { if (!IS_ENABLED(CONFIG_UART0_PORT_F)) { - mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); - if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT)) + mmc_pinmux_setup(CFG_MMC_SUNXI_SLOT); + if (!sunxi_mmc_init(CFG_MMC_SUNXI_SLOT)) return -1; }
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f3c8f7002342..1be4cde2b70e 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -70,7 +70,7 @@ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */
/* mmc config */ -#define CONFIG_MMC_SUNXI_SLOT 0 +#define CFG_MMC_SUNXI_SLOT 0
/* * Miscellaneous configurable options diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a31178b8b6e7..4185a1b9c003 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -129,7 +129,7 @@ CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV -CONFIG_MMC_SUNXI_SLOT +CFG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS