From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 16 May 2012 06:20:59 +0000 (+0000)
Subject: tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS
X-Git-Tag: v2012.07-rc1~11^2~206
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07a84b7b1905f5b7464ad5746507306733eae964;p=u-boot

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 ce0ae9fe1f..3706a4089a 100644
--- 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 2dc350762d..725abc3ddc 100644
--- 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 f53f20eb97..ae3a2de02f 100644
--- 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 f869191f34..475be6c4ba 100644
--- 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 889bdfff38..c346366ae0 100644
--- 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 52dc38e60e..d60b5a1978 100644
--- 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 3e55fe5d1a..a7338f1076 100644
--- 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 6b9ef98837..5efa60cdf6 100644
--- 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"