@@ -247,7 +247,7 @@ void board_init_uart_f(void)
#ifdef CONFIG_TEGRA_ENABLE_UARTC
uart_ids |= UARTC;
#endif
-#ifdef CONFIG_TEGRA_ENABLE_UARTD
+#ifdef CFG_TEGRA_ENABLE_UARTD
uart_ids |= UARTD;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTE
@@ -19,7 +19,7 @@
#define CFG_TEGRA_BOARD_STRING "CEI tk1-som"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* SPI */
@@ -14,7 +14,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
@@ -14,7 +14,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
/* UARTD: keyboard satellite board UART, default */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
@@ -13,7 +13,7 @@
#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
@@ -14,7 +14,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana"
/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
@@ -210,7 +210,7 @@ CFG_STANDALONE_LOAD_ADDR
CFG_STD_DEVICES_SETTINGS
CFG_TEGRA_BOARD_STRING
CFG_TEGRA_ENABLE_UARTA
-CONFIG_TEGRA_ENABLE_UARTD
+CFG_TEGRA_ENABLE_UARTD
CONFIG_TEGRA_SLINK_CTRLS
CONFIG_TEGRA_SPI
CONFIG_TEGRA_UARTA_GPU
Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-tegra/board.c | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/plutux.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/ventana.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)