Skip to content
Snippets Groups Projects
Commit 07a84b7b authored by Stephen Warren's avatar Stephen Warren Committed by Albert ARIBAUD
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarTom Warren <twarren@nvidia.com>
parent d5ebc937
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "tegra2-common.h" #include "tegra2-common.h"
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M@0M nvmem=128M@384M mem=512M@512M"
#define V_PROMPT "Tegra2 (Harmony) # " #define V_PROMPT "Tegra2 (Harmony) # "
#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Harmony" #define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Harmony"
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "tegra2-common.h" #include "tegra2-common.h"
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M@0M nvmem=128M@384M"
#define V_PROMPT "Tegra2 (Medcom) # " #define V_PROMPT "Tegra2 (Medcom) # "
#define CONFIG_TEGRA2_BOARD_STRING "Avionic Design Medcom" #define CONFIG_TEGRA2_BOARD_STRING "Avionic Design Medcom"
#define CONFIG_SYS_BOARD_ODMDATA 0x2b0d8011 #define CONFIG_SYS_BOARD_ODMDATA 0x2b0d8011
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "tegra2-common.h" #include "tegra2-common.h"
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=512M@0M"
#define V_PROMPT "Tegra2 (Paz00) MOD # " #define V_PROMPT "Tegra2 (Paz00) MOD # "
#define CONFIG_TEGRA2_BOARD_STRING "Compal Paz00" #define CONFIG_TEGRA2_BOARD_STRING "Compal Paz00"
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "tegra2-common.h" #include "tegra2-common.h"
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M@0M nvmem=128M@384M"
#define V_PROMPT "Tegra2 (Plutux) # " #define V_PROMPT "Tegra2 (Plutux) # "
#define CONFIG_TEGRA2_BOARD_STRING "Avionic Design Plutux" #define CONFIG_TEGRA2_BOARD_STRING "Avionic Design Plutux"
#define CONFIG_SYS_BOARD_ODMDATA 0x2b2d8011 #define CONFIG_SYS_BOARD_ODMDATA 0x2b2d8011
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#define CONFIG_OF_SEPARATE #define CONFIG_OF_SEPARATE
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M@0M nvmem=128M@384M mem=512M@512M"
#define V_PROMPT "Tegra2 (SeaBoard) # " #define V_PROMPT "Tegra2 (SeaBoard) # "
#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Seaboard" #define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Seaboard"
......
...@@ -140,9 +140,6 @@ ...@@ -140,9 +140,6 @@
"stderr=serial\0" "stderr=serial\0"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttyS0,115200n8\0" \
"mem=" TEGRA2_SYSMEM "\0" \
"smpflag=smp\0" \
TEGRA2_DEVICE_SETTINGS TEGRA2_DEVICE_SETTINGS
#define CONFIG_LOADADDR 0x408000 /* def. location for kernel */ #define CONFIG_LOADADDR 0x408000 /* def. location for kernel */
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#define CONFIG_OF_SEPARATE #define CONFIG_OF_SEPARATE
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M@0M nvmem=128M@384M mem=512M@512M"
#define V_PROMPT "Tegra2 (Ventana) # " #define V_PROMPT "Tegra2 (Ventana) # "
#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Ventana" #define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Ventana"
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#define CONFIG_OF_SEPARATE #define CONFIG_OF_SEPARATE
/* High-level configuration options */ /* High-level configuration options */
#define TEGRA2_SYSMEM "mem=512M@0M"
#define V_PROMPT "Tegra2 (Whistler) # " #define V_PROMPT "Tegra2 (Whistler) # "
#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Whistler" #define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Whistler"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment