Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-tegra/board.c | 2 +- include/configs/trimslice.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index b4e30de509b7..e4f5540cab52 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -168,7 +168,7 @@ static int uart_configs[] = { #if defined(CONFIG_TEGRA20) #if defined(CONFIG_TEGRA_UARTA_UAA_UAB) FUNCMUX_UART1_UAA_UAB, - #elif defined(CONFIG_TEGRA_UARTA_GPU) + #elif defined(CFG_TEGRA_UARTA_GPU) FUNCMUX_UART1_GPU, #elif defined(CONFIG_TEGRA_UARTA_SDIO1) FUNCMUX_UART1_SDIO1, diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index ca5462fe4727..920cbc82d0c1 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -15,7 +15,7 @@
/* Board-specific serial config */ #define CFG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_GPU +#define CFG_TEGRA_UARTA_GPU #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* SPI */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2acc5a7412d6..f3cb0607741b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -213,7 +213,7 @@ CFG_TEGRA_ENABLE_UARTA CFG_TEGRA_ENABLE_UARTD CFG_TEGRA_SLINK_CTRLS CFG_TEGRA_SPI -CONFIG_TEGRA_UARTA_GPU +CFG_TEGRA_UARTA_GPU CONFIG_TEGRA_UARTA_SDIO1 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1