tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS

console isn't used by anything, and the kernel should be set appropriately
by whatever script is booting the kernel, not imposed by the bootloader.

mem might be useful, but the current value is pretty bogus, since it
includes nvmem options that make no sense for an upstream kernel, and
equally should not be required for any downstream kernel. Either way, this
is also best left to the kernel boot script.

smpflag isn't used by anything, and again was probably intended to be a
kernel command-line option better set by the kernel boot script.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index ce0ae9fe1f8784b0d9b86511ac374f56201e082d..3706a4089ac4004554b56350dbd258d018d0ec51 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -28,7 +28,6 @@
 #include "tegra2-common.h"
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM          "mem=384M@0M nvmem=128M@384M mem=512M@512M"
 #define V_PROMPT               "Tegra2 (Harmony) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "NVIDIA Harmony"
 

diff --git a/include/configs/medcom.h b/include/configs/medcom.h
index 2dc350762d57a4e41294cf60bdb47c3c8d21dcfb..725abc3ddc4db6bab3f0d49ca36e623706dd3bf5 100644 (file)
--- a/include/configs/medcom.h
+++ b/include/configs/medcom.h
@@ -29,7 +29,6 @@
 #include "tegra2-common.h"
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM                  "mem=384M@0M nvmem=128M@384M"
 #define V_PROMPT                       "Tegra2 (Medcom) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "Avionic Design Medcom"
 #define CONFIG_SYS_BOARD_ODMDATA       0x2b0d8011

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index f53f20eb97786ed7a3f552d2b75050cf035f84ce..ae3a2de02f72e48746bff2d4ffb07ad092cbf2c3 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -21,7 +21,6 @@
 #include "tegra2-common.h"
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM          "mem=512M@0M"
 #define V_PROMPT               "Tegra2 (Paz00) MOD # "
 #define CONFIG_TEGRA2_BOARD_STRING     "Compal Paz00"
 

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index f869191f34a73e45492bfcfbb7f4585f2cf0e8ee..475be6c4bab91d8e6bf58c639f3eceb56e755ea6 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -29,7 +29,6 @@
 #include "tegra2-common.h"
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM                  "mem=384M@0M nvmem=128M@384M"
 #define V_PROMPT                       "Tegra2 (Plutux) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "Avionic Design Plutux"
 #define CONFIG_SYS_BOARD_ODMDATA       0x2b2d8011

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 889bdfff383b009baf1e36062edd11b33cf2e3bf..c346366ae061ac0844b23219441c5f7cc0a1ef8a 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -41,7 +41,6 @@
 #define CONFIG_OF_SEPARATE
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM          "mem=384M@0M nvmem=128M@384M mem=512M@512M"
 #define V_PROMPT               "Tegra2 (SeaBoard) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "NVIDIA Seaboard"
 

diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index 52dc38e60e29395ba8449462a793d653a6c6da1d..d60b5a1978a35b35dc15e19485dd5432480eaa42 100644 (file)
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -140,9 +140,6 @@
                                        "stderr=serial\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "console=ttyS0,115200n8\0" \
-       "mem=" TEGRA2_SYSMEM "\0" \
-       "smpflag=smp\0" \
        TEGRA2_DEVICE_SETTINGS
 
 #define CONFIG_LOADADDR                0x408000        /* def. location for kernel */

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3e55fe5d1ad4da0387442d0beb7ee4580e41547a..a7338f1076840fd34d1fe4d956a43994f331a64b 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -33,7 +33,6 @@
 #define CONFIG_OF_SEPARATE
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM          "mem=384M@0M nvmem=128M@384M mem=512M@512M"
 #define V_PROMPT               "Tegra2 (Ventana) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "NVIDIA Ventana"
 

diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 6b9ef988379ee83186bc11673c806f80e45ee9ac..5efa60cdf6a6a1335d1958de4f2892ca64acddd8 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -33,7 +33,6 @@
 #define CONFIG_OF_SEPARATE
 
 /* High-level configuration options */
-#define TEGRA2_SYSMEM          "mem=512M@0M"
 #define V_PROMPT               "Tegra2 (Whistler) # "
 #define CONFIG_TEGRA2_BOARD_STRING     "NVIDIA Whistler"