[U-Boot] [PATCH V2 1/4] tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS

[Simon Glass]

On Wed, May 16, 2012 at 9:20 AM, Stephen Warren <swarren at wwwdotorg.org>wrote:

> From: Stephen Warren <swarren at nvidia.com>
>

Acked-by: Simon Glass <sjg at chromium.org>


>
> 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 at nvidia.com>
> ---
> v2: Remove TEGRA2_SYSMEM define from all board configs
> ---
>  include/configs/harmony.h       |    1 -
>  include/configs/medcom.h        |    1 -
>  include/configs/paz00.h         |    1 -
>  include/configs/plutux.h        |    1 -
>  include/configs/seaboard.h      |    1 -
>  include/configs/tegra2-common.h |    3 ---
>  include/configs/ventana.h       |    1 -
>  include/configs/whistler.h      |    1 -
>  8 files changed, 0 insertions(+), 10 deletions(-)
>
> diff --git a/include/configs/harmony.h b/include/configs/harmony.h
> index ce0ae9f..3706a40 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 at 0M nvmem=128M at 384M mem=512M at 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 2dc3507..725abc3 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 at 0M nvmem=128M at 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 f53f20e..ae3a2de 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 at 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 f869191..475be6c 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 at 0M nvmem=128M at 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 46d4228..0af37db 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 at 0M nvmem=128M at 384M mem=512M at 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 068ce88..cdd3093 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 3e55fe5..a7338f1 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 at 0M nvmem=128M at 384M mem=512M at 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 6b9ef98..5efa60c 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 at 0M"
>  #define V_PROMPT               "Tegra2 (Whistler) # "
>  #define CONFIG_TEGRA2_BOARD_STRING     "NVIDIA Whistler"
>
> --
> 1.7.0.4
>
>