@@ -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
@@ -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"
@@ -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 \
@@ -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 */
@@ -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 */
@@ -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
@@ -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 \
@@ -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
@@ -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 */
@@ -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" */
@@ -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" */
@@ -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" */
@@ -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) \
@@ -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" */
@@ -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
@@ -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" */
@@ -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
Signed-off-by: Tom Rini <trini@konsulko.com> --- 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(-)