[U-Boot] [UBOOT PATCH] env: Added support to save env to spi through Kconfig

[Michal Simek]

On 27.6.2018 14:13, Vipul Kumar wrote:
> This patch added support to enable CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET
> and CONFIG_ENV_SECT_SIZE through Kconfig for Zynq and Zynqmp.
> 
> Signed-off-by: Vipul Kumar <vipul.kumar at xilinx.com>
> ---
>  env/Kconfig                     | 27 +++++++++++++++++++++++++++
>  include/configs/xilinx_zynqmp.h |  3 ---
>  include/configs/zynq-common.h   | 13 -------------
>  3 files changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/env/Kconfig b/env/Kconfig
> index 8618376..640a43f 100644
> --- a/env/Kconfig
> +++ b/env/Kconfig
> @@ -480,6 +480,33 @@ config ENV_SIZE
>  
>  endif
>  
> +if ARCH_ZYNQMP || ARCH_ZYNQ
> +
> +config ENV_OFFSET
> +	hex "Environment Offset"
> +	depends on !ENV_IS_NOWHERE
> +	default 0x1E00000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
> +	default 0xE0000 if ARCH_ZYNQ
> +	help
> +	  Offset from the start of the device (or partition)
> +
> +config ENV_SIZE
> +	hex "Environment Size"
> +	default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
> +	default 0x8000 if !ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP

Isn't it enough just?
	default 0x8000 if ARCH_ZYNQMP


> +	default 0x20000 if ARCH_ZYNQ
> +	help
> +	  Size of the environment storage area.
> +
> +config ENV_SECT_SIZE
> +	hex "Environment Sector-Size"
> +	default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
> +	default 0x20000 if !ENV_IS_NOWHERE && ARCH_ZYNQ

There should be default value
.config:633:warning: symbol value '' invalid for ENV_SECT_SIZE

Please check if this macro is used for that ENV_IS options.

Maybe simple
	default 0x40000 if ARCH_ZYNQMP
	default 0x20000 if ARCH_ZYNQ
should be enough.

> +	help
> +	  Size of the sector containing the environment.
> +
> +endif
> +
>  config USE_DEFAULT_ENV_FILE
>  	bool "Create default environment from file"
>  	help
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index e9086f9..7add9ea 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -102,9 +102,6 @@
>  # define PARTS_DEFAULT
>  #endif
>  
> -/* Do not preserve environment */
> -#define CONFIG_ENV_SIZE			0x8000
> -
>  /* Monitor Command Prompt */
>  /* Console I/O Buffer Size */
>  #define CONFIG_SYS_CBSIZE		2048
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 55b983f..16426a7 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -125,22 +125,9 @@
>  # define CONFIG_SYS_EEPROM_SIZE			1024 /* Bytes */
>  #endif
>  
> -/* Total Size of Environment Sector */
> -#ifndef CONFIG_ENV_SIZE
> -# define CONFIG_ENV_SIZE			(128 << 10)
> -#endif
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
>  
> -/* Environment */
> -#ifndef CONFIG_ENV_IS_NOWHERE
> -# define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
> -# ifndef CONFIG_ENV_OFFSET
> -#  define CONFIG_ENV_OFFSET		0xE0000
> -# endif
> -#endif
> -
>  /* enable preboot to be loaded before CONFIG_BOOTDELAY */
>  #define CONFIG_PREBOOT
>  
> 

Thanks,
Michal