ARM: tegra: convert CFG_TEGRA_BOARD_STRING into Kconfig option

Convert CFG_TEGRA_BOARD_STRING into Kconfig option and move it into device
board Kconfig.

Signed-off-by: Svyatoslav Ryhel <[email protected]>

33 files changed, 0 insertions, 182 deletions

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 229b766eefa..21b37b78a30 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -9,10 +9,6 @@
 #include <linux/sizes.h>
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index c33c96a5eb4..7fc2d85f7bd 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -9,10 +9,6 @@
 #include <linux/sizes.h>
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 7b09441258c..aa4057d6da0 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -14,10 +14,6 @@
 #include <linux/sizes.h>
 
 #include "tegra124-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"CEI tk1-som"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 82911eb6165..0946588230d 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -9,12 +9,6 @@
 #include <linux/sizes.h>
 
 #include "tegra114-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/endeavoru.h b/include/configs/endeavoru.h
index 20ffda0d251..8cb3e414af2 100644
--- a/include/configs/endeavoru.h
+++ b/include/configs/endeavoru.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"HTC One X"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/grouper.h b/include/configs/grouper.h
index 834e249d148..aacbcf12658 100644
--- a/include/configs/grouper.h
+++ b/include/configs/grouper.h
@@ -7,10 +7,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"ASUS Google Nexus 7 (2012)"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 793fdffb277..beecb70cd0c 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -9,14 +9,6 @@
 
 #include <linux/sizes.h>
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
-
-/* NAND support */
-
-/* Environment in NAND (which is 512M), aligned to start of last sector */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/ideapad-yoga-11.h b/include/configs/ideapad-yoga-11.h
index 0f98f890ef7..aacbcf12658 100644
--- a/include/configs/ideapad-yoga-11.h
+++ b/include/configs/ideapad-yoga-11.h
@@ -7,10 +7,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Lenovo Ideapad Yoga 11"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 2fb1c353ff8..e4ee5ce6be8 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -10,10 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra124-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 7694a2fc84c..becff398a56 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -10,14 +10,6 @@
 #define __CONFIG_H
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
-
-/* NAND support */
-
-/* Environment in NAND, aligned to start of last sector */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/mocha.h b/include/configs/mocha.h
index a84d599ccc9..7255f31baec 100644
--- a/include/configs/mocha.h
+++ b/include/configs/mocha.h
@@ -10,9 +10,6 @@
 
 #include "tegra124-common.h"
 
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Xiaomi Mocha"
-
 #ifdef CONFIG_TEGRA_SUPPORT_NON_SECURE
   #define CFG_PRAM                     0x38400 /* 225 MB */
 #endif
diff --git a/include/configs/mot.h b/include/configs/mot.h
index 28b8d504769..018672cb28f 100644
--- a/include/configs/mot.h
+++ b/include/configs/mot.h
@@ -10,9 +10,6 @@
 #include <linux/sizes.h>
 #include "tegra20-common.h"
 
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Motorola Mot"
-
 /* Tegra common post configuration overwrites text env in the board */
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"stdin=serial,tegra-kbc,button-kbd,cpcap-pwrbutton\0"
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 84db4bc3bca..808cd908972 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -10,10 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra124-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/ouya.h b/include/configs/ouya.h
index a9f05ae5d01..381941760e3 100644
--- a/include/configs/ouya.h
+++ b/include/configs/ouya.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Ouya Game Console"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index a29d7135d0b..79240bd8ed0 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -10,14 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra210-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
-
-/* Board-specific serial config */
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* _P2371_0000_H */
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 0b077aba659..24f3a7030e8 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -10,14 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra210-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
-
-/* Board-specific serial config */
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* _P2371_2180_H */
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 5155aa7b1dd..0dbb45e7c2a 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -10,14 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra210-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2571"
-
-/* Board-specific serial config */
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* _P2571_H */
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index fc1b7c0302d..914c68ffdf9 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -9,12 +9,6 @@
 #include <linux/sizes.h>
 
 #include "tegra186-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2771-0000"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 1138c1d306f..c5a74e8f8fe 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -9,13 +9,6 @@
 #include <linux/sizes.h>
 
 #include "tegra210-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
-
-/* Board-specific serial config */
-
-/* General networking support */
 #include "tegra-common-post.h"
 
 #endif /* _P3450_0000_H */
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 2d8d1f652bb..ec123804545 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -11,12 +11,6 @@
 
 #include <linux/sizes.h>
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Compal Paz00"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/picasso.h b/include/configs/picasso.h
index 0b08a562018..4b6837dc000 100644
--- a/include/configs/picasso.h
+++ b/include/configs/picasso.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Acer Iconia Tab A500"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 5d7e85d9284..becff398a56 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -10,14 +10,6 @@
 #define __CONFIG_H
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
-
-/* NAND support */
-
-/* Environment in NAND, aligned to start of last sector */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/qc750.h b/include/configs/qc750.h
index f226d5a4c08..2acafb488b1 100644
--- a/include/configs/qc750.h
+++ b/include/configs/qc750.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Wexler QC750"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 79de9f83876..4a2c6623ac1 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -10,16 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* NAND support */
-
-/* Max number of NAND devices */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/surface-rt.h b/include/configs/surface-rt.h
index 58be786ca77..39f7dddf3d4 100644
--- a/include/configs/surface-rt.h
+++ b/include/configs/surface-rt.h
@@ -9,10 +9,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"Microsoft Surface RT"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 4e610164fa3..3d6cb0b5257 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -8,10 +8,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index cb10c0397f9..becff398a56 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -10,14 +10,6 @@
 #define __CONFIG_H
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
-
-/* NAND support */
-
-/* Environment in NAND, aligned to start of last sector */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/transformer-t20.h b/include/configs/transformer-t20.h
index 1876d2cdc69..b82c6e34c8f 100644
--- a/include/configs/transformer-t20.h
+++ b/include/configs/transformer-t20.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"ASUS Transformer"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/transformer-t30.h b/include/configs/transformer-t30.h
index 37828d3a9d9..8cb3e414af2 100644
--- a/include/configs/transformer-t30.h
+++ b/include/configs/transformer-t30.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"ASUS Transformer"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index c4f6defddbc..beecb70cd0c 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -9,15 +9,6 @@
 
 #include <linux/sizes.h>
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"Compulab Trimslice"
-
-/* SPI */
-
-/* Environment in SPI */
-/* 1MiB flash, environment located as high as possible */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index fa001afdc0f..bbebe53d17e 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -10,12 +10,6 @@
 #include <linux/sizes.h>
 
 #include "tegra124-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 7a6e0254545..00f9909b122 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -9,12 +9,6 @@
 
 #include <linux/sizes.h>
 #include "tegra20-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
-
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/x3-t30.h b/include/configs/x3-t30.h
index 286de6a3af4..8cb3e414af2 100644
--- a/include/configs/x3-t30.h
+++ b/include/configs/x3-t30.h
@@ -11,10 +11,6 @@
 #define __CONFIG_H
 
 #include "tegra30-common.h"
-
-/* High-level configuration options */
-#define CFG_TEGRA_BOARD_STRING		"LG X3 Board"
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */