[PoC 200/241] global: Migrate CONFIG_TEGRA_ENABLE_UARTA to CFG

Tom Rini
2022-11-20T14:23:14Z

arch/arm/mach-tegra/board.c | 2 +-
include/configs/apalis-tk1.h | 2 +-
include/configs/apalis_t30.h | 2 +-
include/configs/beaver.h | 2 +-
include/configs/cardhu.h | 2 +-
include/configs/colibri_t20.h | 2 +-
include/configs/colibri_t30.h | 2 +-
include/configs/harmony.h | 2 +-
include/configs/nyan-big.h | 2 +-
include/configs/p2371-0000.h | 2 +-
include/configs/p2371-2180.h | 2 +-
include/configs/p2571.h | 2 +-
include/configs/p3450-0000.h | 2 +-
include/configs/paz00.h | 2 +-
include/configs/trimslice.h | 2 +-
include/configs/venice2.h | 2 +-
scripts/config_whitelist.txt | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index f8b61a2b3e3b..b4b73df2265e 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -238,7 +238,7 @@ void board_init_uart_f(void)
#if IS_ENABLED(CONFIG_TEGRA_PINCTRL)
int uart_ids = 0; /* bit mask of which UART ids to enable */

-#ifdef CONFIG_TEGRA_ENABLE_UARTA
+#ifdef CFG_TEGRA_ENABLE_UARTA
uart_ids |= UARTA;
#endif
#ifdef CONFIG_TEGRA_ENABLE_UARTB
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 7fd99ea907d1..8600529379d1 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -13,7 +13,7 @@
#include "tegra124-common.h"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

#define FDT_MODULE "apalis-v1.2"
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 4f00b3bad3f4..6d017d88707b 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -20,7 +20,7 @@
* Apalis UART3: NVIDIA UARTB
* Apalis UART4: NVIDIA UARTC
*/
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

#define UBOOT_UPDATE \
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index c22cdaed3f74..43bc8dc32159 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -17,7 +17,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

/* SPI */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index c9cf110147a2..29d5e011e6ef 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -21,7 +21,7 @@
"fdtfile=tegra30-cardhu-a04.dtb\0"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

/* SPI */
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 2ba3c3bc87db..19044be6cc06 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -11,7 +11,7 @@
#include "tegra20-common.h"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ffed71a2e828..86097670c275 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -21,7 +21,7 @@
* Colibri UART-B: NVIDIA UARTD
* Colibri UART-C: NVIDIA UARTB
*/
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

#define UBOOT_UPDATE \
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 97914889092b..59ead58587db 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -18,7 +18,7 @@

/* UARTD: keyboard satellite board UART, default */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-#ifdef CONFIG_TEGRA_ENABLE_UARTA
+#ifdef CFG_TEGRA_ENABLE_UARTA
/* UARTA: debug board UART */
#define CFG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE
#endif
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 946759f4fb20..02f8b2c624b3 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

/* SPI */
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 8b734e1e948c..e22cb8e8eb1b 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA

/* Environment in eMMC, at the end of 2nd "boot sector" */

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7120ae7bd808..075b2caa8bd5 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA

/* Environment in eMMC, at the end of 2nd "boot sector" */

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index f1b0faf0091e..c80a6999490d 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA

/* Environment in eMMC, at the end of 2nd "boot sector" */

diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 9eda594b8980..764e412f3dfc 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -14,7 +14,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA

/* Only MMC/PXE/DHCP for now, add USB back in later when supported */
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 387e4fcaf2e5..cbf0c71a1fcb 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -16,7 +16,7 @@
#define CFG_TEGRA_BOARD_STRING "Compal Paz00"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 62c785cc0e78..ca5462fe4727 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -14,7 +14,7 @@
#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_GPU
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 164aebf3045b..1f4860a333be 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -15,7 +15,7 @@
#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2"

/* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 825379421095..130081c36143 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -209,7 +209,7 @@ CFG_STACKBASE
CFG_STANDALONE_LOAD_ADDR
CFG_STD_DEVICES_SETTINGS
CFG_TEGRA_BOARD_STRING
-CONFIG_TEGRA_ENABLE_UARTA
+CFG_TEGRA_ENABLE_UARTA
CONFIG_TEGRA_ENABLE_UARTD
CONFIG_TEGRA_SLINK_CTRLS
CONFIG_TEGRA_SPI
--
2.25.1