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 6e9ef68..68534dc 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 73c0aa0..c801bd2 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 f935cce..5f25680 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 d5fe412..2bf4282 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 915436b..04278f1 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 267647c..741fc25 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 09a3ac9..57324dc 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 36a0cec..34e2729 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 bc9751b..56b4179 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 5fcb51f..32ff61a 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 30ba11d..0ddac85 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 3576914..b26c297 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 0b72c4a..f096737 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 6764440..670a5bb 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 53b6ab3..5a3a67d 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 9e66897..7c8f67f 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 8b76165..3f6f03e 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 23f7c94..be46121 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 63ace66..8a98ace 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 96eaa01..643e082 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 328c946..1f2bfdf 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 d90a74e..7a2ffd8 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 341c8d7..b239d69 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 f94be12..28e9f39 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 8622bda..ffb4122 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 7bc4874..1fc1978 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 1b1116f..52a22b7 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 7a08cd8..48a94e2 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 0924bde..df62519 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 6905f00..7bd51c7 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 c1ad7b7..ea1146f 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 6bab40c..2db127f 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 45a1e5e..2994335 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 25c61d4..bb53cc5 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 229b766..21b37b7 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 c33c96a..7fc2d85 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 7b09441..aa4057d 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 82911eb..0946588 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 20ffda0..8cb3e41 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 834e249..aacbcf1 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 793fdff..beecb70 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 0f98f89..aacbcf1 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 2fb1c35..e4ee5ce 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 7694a2f..becff39 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 a84d599..7255f31 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 28b8d50..018672c 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 84db4bc..808cd90 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 a9f05ae..3819417 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 a29d713..79240bd 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 0b077ab..24f3a70 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 5155aa7..0dbb45e 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 fc1b7c0..914c68f 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 1138c1d..c5a74e8 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 2d8d1f6..ec12380 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 0b08a56..4b6837d 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 5d7e85d..becff39 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 f226d5a..2acafb4 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 79de9f8..4a2c662 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 58be786..39f7ddd 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 4e61016..3d6cb0b 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 cb10c03..becff39 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 1876d2c..b82c6e3 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 37828d3..8cb3e41 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 c4f6def..beecb70 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 fa001af..bbebe53 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 7a6e025..00f9909 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 286de6a..8cb3e41 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 */