summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/board2.c2
-rw-r--r--include/configs/beaver.h2
-rw-r--r--include/configs/cardhu.h2
-rw-r--r--include/configs/cei-tk1-som.h2
-rw-r--r--include/configs/dalmore.h2
-rw-r--r--include/configs/harmony.h2
-rw-r--r--include/configs/jetson-tk1.h2
-rw-r--r--include/configs/medcom-wide.h2
-rw-r--r--include/configs/nyan-big.h2
-rw-r--r--include/configs/p2371-0000.h2
-rw-r--r--include/configs/p2371-2180.h2
-rw-r--r--include/configs/p2571.h2
-rw-r--r--include/configs/p2771-0000.h2
-rw-r--r--include/configs/p3450-0000.h2
-rw-r--r--include/configs/paz00.h2
-rw-r--r--include/configs/plutux.h2
-rw-r--r--include/configs/seaboard.h2
-rw-r--r--include/configs/tec-ng.h2
-rw-r--r--include/configs/tec.h2
-rw-r--r--include/configs/trimslice.h2
-rw-r--r--include/configs/venice2.h2
-rw-r--r--include/configs/ventana.h2
22 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 54bbd8a776..c7a45f4ff8 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 7e0e477960..e622b7127e 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 64d713a196..82729eb95c 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 e49eb60208..fbd38b77fe 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 c9009e3962..095554157f 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 a1a66bfb64..cae7acdb70 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 aa9e1d811a..9858f8ff2b 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 efac0febdf..8dbe741278 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 e885526e62..c04d402deb 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 f426889e1c..a29d7135d0 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 24adf4e13f..0b077aba65 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 8a1e7d9b96..5155aa7b1d 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 84cdd57196..e409cc3896 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 078d35dde2..e60f42eaa7 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 898167009f..950b321764 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 1d8ac618c0..30bfce9f50 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 e5d672746b..8e98620422 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 ae879abe3f..5e49abb49f 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 e8a9df756d..05dd7c96f6 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 b5bf991220..7d1ff2afd1 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 970893ca17..353b5ea67c 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 e7b7b911d9..1d9c60ca7c 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