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 7ca56a3b0811e7b80540f59582008d4baf372f1a..8c946f0f117fe3b673c1344abdda5b1d26137f41 100644 (file)
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -236,18 +236,23 @@ void board_init_uart_f(void)
        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 4c690a17856fe0799ef8e68537789abcfb3049b7..dbb9881f6abfbdcd906505498df3f22b980147a4 100644 (file)
--- 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 87a679efde6d59186761881c96821b91bf5950d5..c806ad0d9daf0fb9e1c7027b4fd5cc67de2332b4 100644 (file)
--- 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 e622b7127e366aff9de3ae569d56b2d65cb70a91..229b766eefad6bd65c59b886940624ca065ce711 100644 (file)
--- 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 3412b883cbb8a3e59d363e916d7561884b571dd2..c33c96a5eb448c3735ed42b19fd785bbd688f5c4 100644 (file)
--- 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 fbd38b77fe55abaecb99b3ea9d8e6daca6e0b2d5..7b09441258c3027d801c521e29cb4d4ed4893338 100644 (file)
--- 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 bc616d143683ddfadcc447200dbccbc75a2327b4..d96a87c059e450bc27789c6c94f9d2c21a817f9b 100644 (file)
--- 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 1f474669a731adef4d53851fa8cdb7051f0a614c..0c93f377361a9632f85ab6b5e06fc17dfe189948 100644 (file)
--- 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 095554157faea2140851c8ccbce1695c8b97f514..82911eb6165039682885ee44c9f35a2706b5d44b 100644 (file)
--- 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 33d0021ec1358db7f6db7360b772ef0be17b93dd..20ffda0d2513c23058608eb16188196da9621a48 100644 (file)
--- 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 b6ef6ff2ecb5a6849110f0bcdf57621ac0b023e8..834e249d1487d3283c8015b7d6662cb7b677c430 100644 (file)
--- 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 cae7acdb70b2fa0899bde48244849f5f1f4546e4..793fdffb2772c9afa9b1cb0aff0e0f92d06437d7 100644 (file)
--- 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 c4e6b2a647cc7932a304965c8c74803456b6a52b..0f98f890ef74502b0c94ec84929ce5134400cd12 100644 (file)
--- 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 9858f8ff2b5d65d5e83276c5d4484613fdf9a02e..2fb1c353ff8ab00f1e53c9c3be248fc3067e047a 100644 (file)
--- 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 8dbe741278a6d776e086129e006dc37122f1b4bc..7694a2fc84ce8d972a98474cf5411924e544ae6b 100644 (file)
--- 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 1c2eb906085e61ac0d30fa2a50d20b380233a96c..a84d599ccc970011eac09463995302c1b1c080b5 100644 (file)
--- 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 63931e90dda5d70bbe006f12155101259290b234..28b8d504769c06f80e9b3c8692a066b6f73755d0 100644 (file)
--- 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 c04d402deb0c4e7474978de9b7da2381f1b995ed..84db4bc3bca91d90a7e259deee892b227e10efa7 100644 (file)
--- 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 cc86c1002e3bbdef678a47a5039ea11987c95964..a9f05ae5d016147f1607753f8f89b6feffb1f14f 100644 (file)
--- 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 950b3217642ba9cc1e2921363d5bab74c89bad63..2d8d1f652bbfa07f9fdb129d20c532fa63522abd 100644 (file)
--- 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 a58c7e5f35336543ef2494ac17e2a29b12ed8226..0b08a5620185ece59baa2b23842b58099f062ece 100644 (file)
--- 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 30bfce9f503c5fe657801fffb16f294b09fd7b0d..5d7e85d9284f565d2aa098ec30098a948d0b7bae 100644 (file)
--- 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 ad9f9146bb77ea84125611b51682f11182ec9c4f..f226d5a4c08b427ade2b6ab3f76fd1cbf61abab6 100644 (file)
--- 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 8e98620422d8efa0e06e6151161fd88169ada185..79de9f838761bb5a20e53091109ac3b1b967cc91 100644 (file)
--- 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 1f0837e179b02bfdf2ba980144e98c7e84115621..58be786ca772361744d7163d214c447fba98e820 100644 (file)
--- 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 5e49abb49faf7d099fb33d08347070f6a2679dd0..4e610164fa3d566ff9623d36fda86ce16ebb9430 100644 (file)
--- 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 05dd7c96f6193e3c323e3ac5ee5fa503640464fe..cb10c0397f93ad6b6f8ac530d6fbf295ef46eb7a 100644 (file)
--- 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 6a3d9b24036b088e9634b8618cac24d96384b6c6..1876d2cdc6927433449f1baad56bcfc658b0964d 100644 (file)
--- 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 792b958a3026bec9532fab7b1cd90a34c2f68da5..37828d3a9d937eb891b3a6a1a5408a491c1d5a5c 100644 (file)
--- 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 7d1ff2afd147b0fbd34cee3329eac30510a2f80d..c4f6defddbcfa22b552b3df237d76f554c1bc785 100644 (file)
--- 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 353b5ea67c13c294f92759d42cdfe19475806a4f..fa001afdc0fea68206edaa4de08416e0a148611b 100644 (file)
--- 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 1d9c60ca7c67b6807214179c680480dd7c065558..7a6e0254545a8dc3a8027f568a1efb22f051e69e 100644 (file)
--- 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 c152af9b7e27b6439eb52193cea1ccc64d94e495..286de6a3af47feae6c4a8bd7e17cf5dcbeb54cc5 100644 (file)
--- 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 */