[PATCH 127/149] global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG

Tom Rini
2022-12-04T15:31:05Z

Perform a simple rename of CONFIG_TEGRA_BOARD_STRING to CFG_TEGRA_BOARD_STRING

Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-tegra/board2.c | 2 +-
include/configs/beaver.h | 2 +-
include/configs/cardhu.h | 2 +-
include/configs/cei-tk1-som.h | 2 +-
include/configs/dalmore.h | 2 +-
include/configs/harmony.h | 2 +-
include/configs/jetson-tk1.h | 2 +-
include/configs/medcom-wide.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/p2771-0000.h | 2 +-
include/configs/p3450-0000.h | 2 +-
include/configs/paz00.h | 2 +-
include/configs/plutux.h | 2 +-
include/configs/seaboard.h | 2 +-
include/configs/tec-ng.h | 2 +-
include/configs/tec.h | 2 +-
include/configs/trimslice.h | 2 +-
include/configs/venice2.h | 2 +-
include/configs/ventana.h | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 54bbd8a776e9..c7a45f4ff82a 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -89,7 +89,7 @@ int checkboard(void)
{
int board_id = tegra_board_id();

- printf("Board: %s", CONFIG_TEGRA_BOARD_STRING);
+ printf("Board: %s", CFG_TEGRA_BOARD_STRING);
if (board_id != -1)
printf(", ID: %d\n", board_id);
printf("\n");
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 7e0e47796073..e622b7127e36 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -11,7 +11,7 @@
#include "tegra30-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 64d713a19691..82729eb95cf6 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -11,7 +11,7 @@
#include "tegra30-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu"

#define BOARD_EXTRA_ENV_SETTINGS \
"board_name=cardhu-a04\0" \
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index e49eb602081d..fbd38b77fe55 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -16,7 +16,7 @@
#include "tegra124-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "CEI tk1-som"
+#define CFG_TEGRA_BOARD_STRING "CEI tk1-som"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index c9009e396237..095554157fae 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -11,7 +11,7 @@
#include "tegra114-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index a1a66bfb64e0..cae7acdb70b2 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -11,7 +11,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"

/* Board-specific serial config */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index aa9e1d811a50..9858f8ff2b5d 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -12,7 +12,7 @@
#include "tegra124-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index efac0febdf81..8dbe741278a6 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -12,7 +12,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"
+#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index e885526e625f..c04d402deb0c 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -12,7 +12,7 @@
#include "tegra124-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"
+#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index f426889e1c41..a29d7135d0bf 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -12,7 +12,7 @@
#include "tegra210-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"

/* Board-specific serial config */

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 24adf4e13f05..0b077aba6592 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -12,7 +12,7 @@
#include "tegra210-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"

/* Board-specific serial config */

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 8a1e7d9b9680..5155aa7b1dd2 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -12,7 +12,7 @@
#include "tegra210-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571"

/* Board-specific serial config */

diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 84cdd5719623..e409cc3896d7 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -11,7 +11,7 @@
#include "tegra186-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"

/* 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 078d35dde2c9..e60f42eaa728 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -11,7 +11,7 @@
#include "tegra210-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"

/* Board-specific serial config */

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 898167009f6a..950b3217642b 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -13,7 +13,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00"
+#define CFG_TEGRA_BOARD_STRING "Compal Paz00"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 1d8ac618c0b2..30bfce9f503c 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -12,7 +12,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux"
+#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index e5d672746b12..8e98620422d8 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -12,7 +12,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index ae879abe3f86..5e49abb49faf 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -10,7 +10,7 @@
#include "tegra30-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"
+#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
diff --git a/include/configs/tec.h b/include/configs/tec.h
index e8a9df756d52..05dd7c96f619 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -12,7 +12,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"
+#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index b5bf99122019..7d1ff2afd147 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -11,7 +11,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"
+#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 970893ca17bb..353b5ea67c13 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -12,7 +12,7 @@
#include "tegra124-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index e7b7b911d9b6..1d9c60ca7c67 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -11,7 +11,7 @@
#include "tegra20-common.h"

/* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana"

/* Board-specific serial config */
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
--
2.25.1