ARM: tegra: board: set CFG_SYS_NS16550_COM1 according to TEGRA_ENABLE_UART
Link CFG_SYS_NS16550_COM1 value to chosen CONFIG_TEGRA_ENABLE_UART Tegra
wide. Remove all CFG_SYS_NS16550_COM1 from device headers.
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 7ca56a3..8c946f0 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -236,18 +236,23 @@
int uart_ids = 0; /* bit mask of which UART ids to enable */
#ifdef CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
uart_ids |= UARTA;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTB
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTB_BASE
uart_ids |= UARTB;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTC
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTC_BASE
uart_ids |= UARTC;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
uart_ids |= UARTD;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTE_BASE
uart_ids |= UARTE;
#endif
setup_uarts(uart_ids);
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 4c690a1..dbb9881 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -12,9 +12,6 @@
#include "tegra124-common.h"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#define FDT_MODULE "apalis-v1.2"
#define FDT_MODULE_V1_0 "apalis"
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 87a679e..c806ad0 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -20,7 +20,6 @@
* Apalis UART3: NVIDIA UARTB
* Apalis UART4: NVIDIA UARTC
*/
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#include "tegra-common-post.h"
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index e622b71..229b766 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 3412b88..c33c96a 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index fbd38b7..7b09441 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -18,9 +18,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "CEI tk1-som"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index bc616d1..d96a87c 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -9,10 +9,6 @@
#define __CONFIG_H
#include "tegra20-common.h"
-
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 1f47466..0c93f37 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -21,7 +21,6 @@
* Colibri UART-B: NVIDIA UARTD
* Colibri UART-C: NVIDIA UARTB
*/
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#include "tegra-common-post.h"
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 0955541..82911eb 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#include "tegra-common-post.h"
diff --git a/include/configs/endeavoru.h b/include/configs/endeavoru.h
index 33d0021..20ffda0 100644
--- a/include/configs/endeavoru.h
+++ b/include/configs/endeavoru.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "HTC One X"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/grouper.h b/include/configs/grouper.h
index b6ef6ff..834e249 100644
--- a/include/configs/grouper.h
+++ b/include/configs/grouper.h
@@ -11,9 +11,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "ASUS Google Nexus 7 (2012)"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index cae7acd..793fdff 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -13,15 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"
-/* Board-specific serial config */
-
-/* UARTD: keyboard satellite board UART, default */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-#ifdef CONFIG_TEGRA_ENABLE_UARTA
-/* UARTA: debug board UART */
-#define CFG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE
-#endif
-
/* NAND support */
/* Environment in NAND (which is 512M), aligned to start of last sector */
diff --git a/include/configs/ideapad-yoga-11.h b/include/configs/ideapad-yoga-11.h
index c4e6b2a..0f98f89 100644
--- a/include/configs/ideapad-yoga-11.h
+++ b/include/configs/ideapad-yoga-11.h
@@ -11,9 +11,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Lenovo Ideapad Yoga 11"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 9858f8f..2fb1c35 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 8dbe741..7694a2f 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* NAND support */
/* Environment in NAND, aligned to start of last sector */
diff --git a/include/configs/mocha.h b/include/configs/mocha.h
index 1c2eb90..a84d599 100644
--- a/include/configs/mocha.h
+++ b/include/configs/mocha.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Xiaomi Mocha"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#ifdef CONFIG_TEGRA_SUPPORT_NON_SECURE
#define CFG_PRAM 0x38400 /* 225 MB */
#endif
diff --git a/include/configs/mot.h b/include/configs/mot.h
index 63931e9..28b8d50 100644
--- a/include/configs/mot.h
+++ b/include/configs/mot.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Motorola Mot"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTB_BASE
-
/* Tegra common post configuration overwrites text env in the board */
#define BOARD_EXTRA_ENV_SETTINGS \
"stdin=serial,tegra-kbc,button-kbd,cpcap-pwrbutton\0"
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index c04d402..84db4bc 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/ouya.h b/include/configs/ouya.h
index cc86c10..a9f05ae 100644
--- a/include/configs/ouya.h
+++ b/include/configs/ouya.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Ouya Game Console"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 950b321..2d8d1f6 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Compal Paz00"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#include "tegra-common-post.h"
diff --git a/include/configs/picasso.h b/include/configs/picasso.h
index a58c7e5..0b08a56 100644
--- a/include/configs/picasso.h
+++ b/include/configs/picasso.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Acer Iconia Tab A500"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 30bfce9..5d7e85d 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* NAND support */
/* Environment in NAND, aligned to start of last sector */
diff --git a/include/configs/qc750.h b/include/configs/qc750.h
index ad9f914..f226d5a 100644
--- a/include/configs/qc750.h
+++ b/include/configs/qc750.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Wexler QC750"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 8e98620..79de9f8 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
/* NAND support */
diff --git a/include/configs/surface-rt.h b/include/configs/surface-rt.h
index 1f0837e..58be786 100644
--- a/include/configs/surface-rt.h
+++ b/include/configs/surface-rt.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Microsoft Surface RT"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 5e49abb..4e61016 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -12,9 +12,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 05dd7c9..cb10c03 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* NAND support */
/* Environment in NAND, aligned to start of last sector */
diff --git a/include/configs/transformer-t20.h b/include/configs/transformer-t20.h
index 6a3d9b2..1876d2c 100644
--- a/include/configs/transformer-t20.h
+++ b/include/configs/transformer-t20.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "ASUS Transformer"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/transformer-t30.h b/include/configs/transformer-t30.h
index 792b958..37828d3 100644
--- a/include/configs/transformer-t30.h
+++ b/include/configs/transformer-t30.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "ASUS Transformer"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 7d1ff2a..c4f6def 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
/* SPI */
/* Environment in SPI */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 353b5ea..fa001af 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -14,9 +14,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#include "tegra-common-post.h"
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 1d9c60c..7a6e025 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#include "tegra-common-post.h"
diff --git a/include/configs/x3-t30.h b/include/configs/x3-t30.h
index c152af9..286de6a 100644
--- a/include/configs/x3-t30.h
+++ b/include/configs/x3-t30.h
@@ -15,9 +15,6 @@
/* High-level configuration options */
#define CFG_TEGRA_BOARD_STRING "LG X3 Board"
-/* Board-specific serial config */
-#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */