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 <clamor95@gmail.com>

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 6e9ef68caf9796ab0540d27939ab0ae859157695..68534dcbb22afa5f6cc97c35a942fe435f226830 100644 (file)
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -96,7 +96,7 @@ int checkboard(void)
 {
        int board_id = tegra_board_id();
 
-       printf("Board: %s", CFG_TEGRA_BOARD_STRING);
+       printf("Board: %s", CONFIG_TEGRA_BOARD_STRING);
        if (board_id != -1)
                printf(", ID: %d\n", board_id);
        printf("\n");

diff --git a/board/acer/picasso/Kconfig b/board/acer/picasso/Kconfig
index 73c0aa0850884ea3c8f26f92c5067fb263731a09..c801bd26c7c6257e8b4bc3116fdff14dd817d2a1 100644 (file)
--- a/board/acer/picasso/Kconfig
+++ b/board/acer/picasso/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "picasso"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Acer Iconia Tab A500"
+
 endif

diff --git a/board/asus/grouper/Kconfig b/board/asus/grouper/Kconfig
index f935cce4225acc41a61f8e15f23c5171ea05c9eb..5f25680d916f2bc89d6fe266b0c39962b2df55c3 100644 (file)
--- a/board/asus/grouper/Kconfig
+++ b/board/asus/grouper/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "grouper"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "ASUS Google Nexus 7 (2012)"
+
 endif

diff --git a/board/asus/transformer-t20/Kconfig b/board/asus/transformer-t20/Kconfig
index d5fe412828977e1241c2a3091f928db6596996f8..2bf42825270d8090c8442d282011ba87ad5f27be 100644 (file)
--- a/board/asus/transformer-t20/Kconfig
+++ b/board/asus/transformer-t20/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "transformer-t20"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "ASUS Transformer T20"
+
 endif

diff --git a/board/asus/transformer-t30/Kconfig b/board/asus/transformer-t30/Kconfig
index 915436ba6c5659708b017674b10fd838e65a1ea8..04278f139dc6218654f66350016f0c336bd0579b 100644 (file)
--- a/board/asus/transformer-t30/Kconfig
+++ b/board/asus/transformer-t30/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "transformer-t30"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "ASUS Transformer T30"
+
 endif

diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig
index 267647cb41faf99de765a1416ece14bc41c492f2..741fc258b3a930139ea74161888bd9f330313c8f 100644 (file)
--- a/board/avionic-design/medcom-wide/Kconfig
+++ b/board/avionic-design/medcom-wide/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "medcom-wide"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Avionic Design Medcom-Wide"
+
 endif

diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig
index 09a3ac940daa3f257459906dcc92bdd0341b4b36..57324dc19e745e9f6720392753ab5320a3b7cde1 100644 (file)
--- a/board/avionic-design/plutux/Kconfig
+++ b/board/avionic-design/plutux/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "plutux"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Avionic Design Plutux"
+
 endif

diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig
index 36a0cec1be1fb6b5916a59221bea0e8ae39f5a03..34e2729fd60bbe58d23340c99f93ccef5af8d41d 100644 (file)
--- a/board/avionic-design/tec-ng/Kconfig
+++ b/board/avionic-design/tec-ng/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "tec-ng"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Avionic Design Tamonten™ NG Evaluation Carrier"
+
 endif

diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig
index bc9751b1086aec1653518bda86a259de729ef45d..56b417950eba3f4ca785587e69d6893836223d9b 100644 (file)
--- a/board/avionic-design/tec/Kconfig
+++ b/board/avionic-design/tec/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "tec"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Avionic Design Tamonten Evaluation Carrier"
+
 endif

diff --git a/board/cei/cei-tk1-som/Kconfig b/board/cei/cei-tk1-som/Kconfig
index 5fcb51f2f26a84e8528db211b5f6ba382e7446e5..32ff61ac44da564ec494ca0906c6edc5d96d1638 100644 (file)
--- a/board/cei/cei-tk1-som/Kconfig
+++ b/board/cei/cei-tk1-som/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "cei-tk1-som"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "CEI tk1-som"
+
 endif

diff --git a/board/compal/paz00/Kconfig b/board/compal/paz00/Kconfig
index 30ba11d360a7be8118a890bd56844b75c2ee9597..0ddac85be12d32a977c1bf467d8eb408d88d8402 100644 (file)
--- a/board/compal/paz00/Kconfig
+++ b/board/compal/paz00/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "paz00"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Compal Paz00"
+
 endif

diff --git a/board/compulab/trimslice/Kconfig b/board/compulab/trimslice/Kconfig
index 35769140347a869a92987881907340eb606a0c2d..b26c2970fe49ab6e1d34471f42427b793dc1b333 100644 (file)
--- a/board/compulab/trimslice/Kconfig
+++ b/board/compulab/trimslice/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "trimslice"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Compulab Trimslice"
+
 endif

diff --git a/board/htc/endeavoru/Kconfig b/board/htc/endeavoru/Kconfig
index 0b72c4a687d081205ee56d687770a3ecd3d953bb..f0967376647fd1b12288586842426ca08cad3403 100644 (file)
--- a/board/htc/endeavoru/Kconfig
+++ b/board/htc/endeavoru/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "endeavoru"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "HTC One X"
+
 endif

diff --git a/board/lenovo/ideapad-yoga-11/Kconfig b/board/lenovo/ideapad-yoga-11/Kconfig
index 67644409fc18466e4e8b22908a8a6a5ac388d0b5..670a5bb700ce7f6d49979e2e7682c479e8964c95 100644 (file)
--- a/board/lenovo/ideapad-yoga-11/Kconfig
+++ b/board/lenovo/ideapad-yoga-11/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "ideapad-yoga-11"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Lenovo Ideapad Yoga 11"
+
 endif

diff --git a/board/lg/x3-t30/Kconfig b/board/lg/x3-t30/Kconfig
index 53b6ab3e93cc251c444ec6ce676fb2a00be843ab..5a3a67d9f3b42348af4208df80a52ea7c98b2691 100644 (file)
--- a/board/lg/x3-t30/Kconfig
+++ b/board/lg/x3-t30/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "x3-t30"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "LG X3 Board"
+
 endif

diff --git a/board/microsoft/surface-rt/Kconfig b/board/microsoft/surface-rt/Kconfig
index 9e66897f6b1aa74f53d348f42913b2ccbd94b10b..7c8f67f21cb8e6834289f892a524dfbb2064eec7 100644 (file)
--- a/board/microsoft/surface-rt/Kconfig
+++ b/board/microsoft/surface-rt/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "surface-rt"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Microsoft Surface RT"
+
 endif

diff --git a/board/motorola/mot/Kconfig b/board/motorola/mot/Kconfig
index 8b76165ade71e64b5bb3e24d885cdef438702684..3f6f03e95b54c7fcf9a79926cdd0f22a2dcffa8c 100644 (file)
--- a/board/motorola/mot/Kconfig
+++ b/board/motorola/mot/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "mot"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Motorola Mot"
+
 endif

diff --git a/board/nvidia/beaver/Kconfig b/board/nvidia/beaver/Kconfig
index 23f7c945f57f1c9f9f04292de5a3a08e55121720..be46121422367e9839d2bbc53b8401b0c961ace3 100644 (file)
--- a/board/nvidia/beaver/Kconfig
+++ b/board/nvidia/beaver/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "beaver"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Beaver"
+
 endif

diff --git a/board/nvidia/cardhu/Kconfig b/board/nvidia/cardhu/Kconfig
index 63ace66aa7862576869993f8598d48ab218ba381..8a98ace70b503f873e6de720695490a9b2d7c8fc 100644 (file)
--- a/board/nvidia/cardhu/Kconfig
+++ b/board/nvidia/cardhu/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "cardhu"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Cardhu"
+
 endif

diff --git a/board/nvidia/dalmore/Kconfig b/board/nvidia/dalmore/Kconfig
index 96eaa01cf87058ecb9b45dd525116b2ede848a58..643e082ec06e99967c2212f02bbfdc384dfed842 100644 (file)
--- a/board/nvidia/dalmore/Kconfig
+++ b/board/nvidia/dalmore/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "dalmore"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Dalmore"
+
 endif

diff --git a/board/nvidia/harmony/Kconfig b/board/nvidia/harmony/Kconfig
index 328c94677da12c762f2aa92cbaab551a8bc0a5fc..1f2bfdfe5d88f2cb61b321c18bf8019a1a121eb9 100644 (file)
--- a/board/nvidia/harmony/Kconfig
+++ b/board/nvidia/harmony/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "harmony"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Harmony"
+
 endif

diff --git a/board/nvidia/jetson-tk1/Kconfig b/board/nvidia/jetson-tk1/Kconfig
index d90a74ea382fb4101e72eebecd01965aee49ab61..7a2ffd83c84c89427129578b1a139245c8aa012d 100644 (file)
--- a/board/nvidia/jetson-tk1/Kconfig
+++ b/board/nvidia/jetson-tk1/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "jetson-tk1"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Jetson TK1"
+
 endif

diff --git a/board/nvidia/nyan-big/Kconfig b/board/nvidia/nyan-big/Kconfig
index 341c8d75c21c8a1b73a8b8f4608d1b174453c5df..b239d69f5e5b1362933416ce240ead77fd38e98c 100644 (file)
--- a/board/nvidia/nyan-big/Kconfig
+++ b/board/nvidia/nyan-big/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "nyan-big"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Google/NVIDIA Nyan-big"
+
 endif

diff --git a/board/nvidia/p2371-0000/Kconfig b/board/nvidia/p2371-0000/Kconfig
index f94be12be1a0d94338b50d17de4aae3681706a97..28e9f39045c98fefe3f82e0cd62d13c0f81baaa5 100644 (file)
--- a/board/nvidia/p2371-0000/Kconfig
+++ b/board/nvidia/p2371-0000/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "p2371-0000"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA P2371-0000"
+
 endif

diff --git a/board/nvidia/p2371-2180/Kconfig b/board/nvidia/p2371-2180/Kconfig
index 8622bdaa16bcc8164423a6d1f70da17e0804e4a1..ffb412229c11c9ed7e5e42b07d38cf7b229a1044 100644 (file)
--- a/board/nvidia/p2371-2180/Kconfig
+++ b/board/nvidia/p2371-2180/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "p2371-2180"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA P2371-2180"
+
 endif

diff --git a/board/nvidia/p2571/Kconfig b/board/nvidia/p2571/Kconfig
index 7bc4874840887759ead77b3f07bf98762f4758ff..1fc1978c63981d5631d8a81a648678aaad5829ae 100644 (file)
--- a/board/nvidia/p2571/Kconfig
+++ b/board/nvidia/p2571/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "p2571"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA P2571"
+
 endif

diff --git a/board/nvidia/p2771-0000/Kconfig b/board/nvidia/p2771-0000/Kconfig
index 1b1116f020989957afa8be54ae7623e503d3c681..52a22b797345be304793054e10edc16269a78d14 100644 (file)
--- a/board/nvidia/p2771-0000/Kconfig
+++ b/board/nvidia/p2771-0000/Kconfig
@@ -13,4 +13,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "p2771-0000"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA P2771-0000"
+
 endif

diff --git a/board/nvidia/p3450-0000/Kconfig b/board/nvidia/p3450-0000/Kconfig
index 7a08cd88675f85e4dd32f0f8f7888856abc27f73..48a94e24d54fe3ca5f0731036498b924237eec72 100644 (file)
--- a/board/nvidia/p3450-0000/Kconfig
+++ b/board/nvidia/p3450-0000/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "p3450-0000"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA P3450-0000"
+
 endif

diff --git a/board/nvidia/seaboard/Kconfig b/board/nvidia/seaboard/Kconfig
index 0924bde480f68ee7356676814eef9ff8ff09d839..df62519c6527cf5ca552638ccb6ad325c6174ce7 100644 (file)
--- a/board/nvidia/seaboard/Kconfig
+++ b/board/nvidia/seaboard/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "seaboard"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Seaboard"
+
 endif

diff --git a/board/nvidia/venice2/Kconfig b/board/nvidia/venice2/Kconfig
index 6905f0014ea7caa00fa29c08b66f8e735ffbb765..7bd51c7a278151d76c7a2310ab2c93b08160bb62 100644 (file)
--- a/board/nvidia/venice2/Kconfig
+++ b/board/nvidia/venice2/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "venice2"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Venice2"
+
 endif

diff --git a/board/nvidia/ventana/Kconfig b/board/nvidia/ventana/Kconfig
index c1ad7b76712cac3e5758d513b89416cecd61891b..ea1146f75b730a594b7d5f3c2c194c6d8080e50d 100644 (file)
--- a/board/nvidia/ventana/Kconfig
+++ b/board/nvidia/ventana/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "ventana"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "NVIDIA Ventana"
+
 endif

diff --git a/board/ouya/ouya/Kconfig b/board/ouya/ouya/Kconfig
index 6bab40ce9336387e5981366e61b3ab42ba2dc258..2db127f3e144c228593678a1bc1c733098bae28a 100644 (file)
--- a/board/ouya/ouya/Kconfig
+++ b/board/ouya/ouya/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "ouya"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Ouya Game Console"
+
 endif

diff --git a/board/wexler/qc750/Kconfig b/board/wexler/qc750/Kconfig
index 45a1e5e057b62f41697f1935e4e9cda6cd89030a..29943358b84efd7ed508e54a625b36322177e178 100644 (file)
--- a/board/wexler/qc750/Kconfig
+++ b/board/wexler/qc750/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "qc750"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Wexler QC750"
+
 endif

diff --git a/board/xiaomi/mocha/Kconfig b/board/xiaomi/mocha/Kconfig
index 25c61d4169e66d64f482919ca6d5c583bc102651..bb53cc561611d2d34c595cc5a0a9010556b9c839 100644 (file)
--- a/board/xiaomi/mocha/Kconfig
+++ b/board/xiaomi/mocha/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "mocha"
 
+config TEGRA_BOARD_STRING
+       string "Default Tegra board name"
+       default "Xiaomi Mocha"
+
 endif

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 229b766eefad6bd65c59b886940624ca065ce711..21b37b78a30de61e5580494dc8b63a15eb774a55 100644 (file)
--- 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 c33c96a5eb448c3735ed42b19fd785bbd688f5c4..7fc2d85f7bdcf09d35af333ec0b90952c5e08af2 100644 (file)
--- 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 7b09441258c3027d801c521e29cb4d4ed4893338..aa4057d6da0af5d7f58c8374f5480bf511f1498c 100644 (file)
--- 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 82911eb6165039682885ee44c9f35a2706b5d44b..0946588230df1ade228e8ae4e0e1b94583cda9b4 100644 (file)
--- 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 20ffda0d2513c23058608eb16188196da9621a48..8cb3e414af2a559b476f20f2bc01667704da339b 100644 (file)
--- 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 834e249d1487d3283c8015b7d6662cb7b677c430..aacbcf126582f32472ebe066d20c784449d0b069 100644 (file)
--- 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 793fdffb2772c9afa9b1cb0aff0e0f92d06437d7..beecb70cd0c4ca8c4d6a07db56d82b4137ddce54 100644 (file)
--- 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 0f98f890ef74502b0c94ec84929ce5134400cd12..aacbcf126582f32472ebe066d20c784449d0b069 100644 (file)
--- 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 2fb1c353ff8ab00f1e53c9c3be248fc3067e047a..e4ee5ce6be8c12f2e853e1f8cc853bd7113655ce 100644 (file)
--- 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 7694a2fc84ce8d972a98474cf5411924e544ae6b..becff398a569d9dd56881697b9786757882cc95a 100644 (file)
--- 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 a84d599ccc970011eac09463995302c1b1c080b5..7255f31baec65dd95a457e1ed84ece2bf3318fb9 100644 (file)
--- 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 28b8d504769c06f80e9b3c8692a066b6f73755d0..018672cb28fd30e5aff5fa798538f6b898c7f20c 100644 (file)
--- 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 84db4bc3bca91d90a7e259deee892b227e10efa7..808cd90897279b29199b15b68f3448f8289ef1c6 100644 (file)
--- 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 a9f05ae5d016147f1607753f8f89b6feffb1f14f..381941760e30586d76f8dc0d7b3ba31e934ede69 100644 (file)
--- 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 a29d7135d0bf2ff7645d18649a3e7fb28bde355e..79240bd8ed00aad2f5daca7df432557dbcb72da2 100644 (file)
--- 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 0b077aba6592a10af687bcfca3e576bd74a5143c..24f3a7030e816fc466039418fb1e957aa804d6f2 100644 (file)
--- 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 5155aa7b1dd2e40a5ff26818a69f97747ee73a5c..0dbb45e7c2a2f1615759aec7640e8c64f584c4a2 100644 (file)
--- 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 fc1b7c0302d6a9f1f5fb9d0e60910bd15bcc509e..914c68ffdf9f8054852960bfc4817b81fc478f65 100644 (file)
--- 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 1138c1d306f25584707b3e295212da64d83ecf5c..c5a74e8f8fe0518f9adbfe31881fb810eaefde48 100644 (file)
--- 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 2d8d1f652bbfa07f9fdb129d20c532fa63522abd..ec1238045451ef75da9b8b166d1c29677f717b32 100644 (file)
--- 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 0b08a5620185ece59baa2b23842b58099f062ece..4b6837dc00079fcb0ed0f6cf1d048bed7146a864 100644 (file)
--- 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 5d7e85d9284f565d2aa098ec30098a948d0b7bae..becff398a569d9dd56881697b9786757882cc95a 100644 (file)
--- 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 f226d5a4c08b427ade2b6ab3f76fd1cbf61abab6..2acafb488b1a048672c11a008ce6e5a96a06ab0e 100644 (file)
--- 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 79de9f838761bb5a20e53091109ac3b1b967cc91..4a2c6623ac1584d74c81062c2e283804133ab6d1 100644 (file)
--- 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 58be786ca772361744d7163d214c447fba98e820..39f7dddf3d47493bb3ee8e2375d4c38ce1e9c911 100644 (file)
--- 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 4e610164fa3d566ff9623d36fda86ce16ebb9430..3d6cb0b525771355fcbc160a96100459f6c6dd4f 100644 (file)
--- 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 cb10c0397f93ad6b6f8ac530d6fbf295ef46eb7a..becff398a569d9dd56881697b9786757882cc95a 100644 (file)
--- 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 1876d2cdc6927433449f1baad56bcfc658b0964d..b82c6e34c8fe9943a61bc806a4b493b488c2c6c0 100644 (file)
--- 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 37828d3a9d937eb891b3a6a1a5408a491c1d5a5c..8cb3e414af2a559b476f20f2bc01667704da339b 100644 (file)
--- 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 c4f6defddbcfa22b552b3df237d76f554c1bc785..beecb70cd0c4ca8c4d6a07db56d82b4137ddce54 100644 (file)
--- 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 fa001afdc0fea68206edaa4de08416e0a148611b..bbebe53d17e3a7deb837ed60b36ace143e5b5b30 100644 (file)
--- 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 7a6e0254545a8dc3a8027f568a1efb22f051e69e..00f9909b1222ba2583431c3f71480d7bb34ceb9d 100644 (file)
--- 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 286de6a3af47feae6c4a8bd7e17cf5dcbeb54cc5..8cb3e414af2a559b476f20f2bc01667704da339b 100644 (file)
--- 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 */