[PoC 205/241] global: Migrate CONFIG_TEGRA_UARTA_SDIO1 to CFG

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

arch/arm/mach-tegra/board.c | 2 +-
include/configs/colibri_t20.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index e4f5540cab52..45bc1b8c9673 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -170,7 +170,7 @@ static int uart_configs[] = {
FUNCMUX_UART1_UAA_UAB,
#elif defined(CFG_TEGRA_UARTA_GPU)
FUNCMUX_UART1_GPU,
- #elif defined(CONFIG_TEGRA_UARTA_SDIO1)
+ #elif defined(CFG_TEGRA_UARTA_SDIO1)
FUNCMUX_UART1_SDIO1,
#else
FUNCMUX_UART1_IRRX_IRTX,
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 19044be6cc06..206221606fa3 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -12,7 +12,7 @@

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

/* NAND support */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f3cb0607741b..bb11839ede29 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -214,7 +214,7 @@ CFG_TEGRA_ENABLE_UARTD
CFG_TEGRA_SLINK_CTRLS
CFG_TEGRA_SPI
CFG_TEGRA_UARTA_GPU
-CONFIG_TEGRA_UARTA_SDIO1
+CFG_TEGRA_UARTA_SDIO1
CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
CONFIG_TESTPIN_MASK
--
2.25.1