[U-Boot] [PATCH 1/5] nios2: Calculate the env position from monitor size

[Thomas Chou <thomas@wytron.com.tw>]

Hi Marek,

On 2015?12?15? 10:09, Marek Vasut wrote:
> Reorder the 10m50 and 3c120 config files such, that the environment
> position can be calculated from the monitor size. The environment is
> placed right after the monitor. This removes one more ad-hoc variable.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Thomas Chou <thomas@wytron.com.tw>
> ---
>   include/configs/10m50_devboard.h | 26 +++++++++++++-------------
>   include/configs/3c120_devboard.h | 26 +++++++++++++-------------
>   2 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
> index 8a91cdb..c99177c 100644
> --- a/include/configs/10m50_devboard.h
> +++ b/include/configs/10m50_devboard.h
> @@ -54,19 +54,6 @@
>   #define CONFIG_LMB
>
>   /*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -#define CONFIG_ENV_IS_IN_FLASH
> -
> -#define CONFIG_ENV_SIZE			0x10000	/* 64k, 1 sector */
> -#define CONFIG_ENV_OVERWRITE		/* Serial change Ok	*/
> -#define CONFIG_ENV_ADDR			0xf4040000
> -
> -/*
>    * MEMORY ORGANIZATION
>    * -Monitor at top of sdram.
>    * -The heap is placed below the monitor
> @@ -83,6 +70,19 @@
>   #define CONFIG_SYS_MALLOC_LEN		0x20000
>
>   /*
> + * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> + * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> + * reset address, no? This will keep the environment in user region
> + * of flash. NOTE: the monitor length must be multiple of sector size
> + * (which is common practice).
> + */
> +#define CONFIG_ENV_IS_IN_FLASH
> +
> +#define CONFIG_ENV_SIZE			0x10000	/* 64k, 1 sector */
> +#define CONFIG_ENV_OVERWRITE		/* Serial change Ok	*/
> +#define CONFIG_ENV_ADDR			(0xf4000000 + CONFIG_SYS_MONITOR_LEN)
> +
> +/*
>    * MISC
>    */
>   #define CONFIG_SYS_LONGHELP		/* Provide extended help */
> diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
> index 2ecdd5d..0f494e5 100644
> --- a/include/configs/3c120_devboard.h
> +++ b/include/configs/3c120_devboard.h
> @@ -57,19 +57,6 @@
>   #define CONFIG_LMB
>
>   /*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -#define CONFIG_ENV_IS_IN_FLASH
> -
> -#define CONFIG_ENV_SIZE			0x20000	/* 128k, 1 sector */
> -#define CONFIG_ENV_OVERWRITE		/* Serial change Ok	*/
> -#define CONFIG_ENV_ADDR			0xe2840000
> -
> -/*
>    * MEMORY ORGANIZATION
>    * -Monitor at top of sdram.
>    * -The heap is placed below the monitor
> @@ -86,6 +73,19 @@
>   #define CONFIG_SYS_MALLOC_LEN		0x20000
>
>   /*
> + * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> + * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> + * reset address, no? This will keep the environment in user region
> + * of flash. NOTE: the monitor length must be multiple of sector size
> + * (which is common practice).
> + */
> +#define CONFIG_ENV_IS_IN_FLASH
> +
> +#define CONFIG_ENV_SIZE			0x20000	/* 128k, 1 sector */
> +#define CONFIG_ENV_OVERWRITE		/* Serial change Ok	*/
> +#define CONFIG_ENV_ADDR			(0xe2800000 + CONFIG_SYS_MONITOR_LEN)
> +
> +/*
>    * MISC
>    */
>   #define CONFIG_SYS_LONGHELP		/* Provide extended help */
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

Thanks,
Thomas