[PoC 201/241] global: Migrate CONFIG_TEGRA_ENABLE_UARTD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at 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(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index b4b73df2265e..b4e30de509b7 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -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
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 045cd25104d7..73b51336973e 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -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 */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 8f97848b1714..806fcd039f22 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -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" */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 59ead58587db..028ff8b8144b 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -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
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 4878e6526b5a..0f29d21e9d47 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -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" */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index e0d947f7e3c5..0096d1be50a4 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -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 */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 82ef6959fd2f..385b1aef7b81 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -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 */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 5cbc33461251..9b2fa23e076a 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -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" */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 966750539b5d..22099a86d5f6 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -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" */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index b8819909b6bc..b344b3e5f16e 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -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 */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index e585fb93d308..24335f90157d 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -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" */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 130081c36143..c3ff80696412 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
-- 
2.25.1