Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/mxc_nand.c | 2 +- include/configs/m53menlo.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 78f5719bc6ef..36c61c2eb8cf 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this) host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE; #ifdef MXC_NFC_V3_2 host->ip_regs = - (struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE; + (struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE; #endif host->clk_act = 1;
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 0684a9743a1c..6d0f43999681 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -46,7 +46,7 @@ #ifdef CONFIG_CMD_NAND #define CFG_SYS_NAND_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI -#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR +#define CFG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CFG_SYS_NAND_LARGEPAGE #define CFG_MXC_NAND_HWECC #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2030e582de3f..c83a676a330a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -135,7 +135,7 @@ CFG_MTD_NAND_VERIFY_WRITE CFG_MVGBE_PORTS CFG_MXC_GPT_HCLK CFG_MXC_NAND_HWECC -CONFIG_MXC_NAND_IP_REGS_BASE +CFG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE CONFIG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS