[PATCH v2 3/3] configs: sandbox: Enable environment in SPI NOR support

[Heinrich Schuchardt]

On 12/23/25 15:31, Marek Vasut wrote:
> Make environment support in SPI NOR available in sandbox,
> so the environment storage in SPI NOR can be tested in CI.
> Enable redundant environment support as well to cover this
> in CI tests too.

Applying: configs: sandbox: Enable environment in SPI NOR support
error: patch failed: configs/sandbox64_defconfig:106
error: configs/sandbox64_defconfig: patch does not apply
error: patch failed: configs/sandbox_defconfig:154
error: configs/sandbox_defconfig: patch does not apply
Patch failed at 0001 configs: sandbox: Enable environment in SPI NOR support


@Simon:

Can we move the sandbox documentation to doc/board/. This is where all 
other architectures are described. I has a hard time finding that 
backing file is spi.bin for this functionality.

The sandbox driver should properly detect the SPI size.

$ truncate -s 8M spi.bin
=> sf probe
SF: Detected m25p16 with page size 256 Bytes, erase size 64 KiB, total 2 MiB

$ truncate -s 1M spi.bin
=> sf probe
SF: Detected m25p16 with page size 256 Bytes, erase size 64 KiB, total 2 MiB

> 
> Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
> ---
> Cc: Heinrich Schuchardt <xypron.glpk at gmx.de>
> Cc: Jerome Forissier <jerome.forissier at linaro.org>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: u-boot at lists.denx.de
> ---
> V2: Enable ENV_REDUNDANT_UPGRADE
> ---
>   board/sandbox/sandbox.c     | 1 +
>   configs/sandbox64_defconfig | 7 +++++++
>   configs/sandbox_defconfig   | 7 +++++++
>   3 files changed, 15 insertions(+)
> 
> diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
> index d0bb3e3bb48..13006a0ffc2 100644
> --- a/board/sandbox/sandbox.c
> +++ b/board/sandbox/sandbox.c
> @@ -89,6 +89,7 @@ static enum env_location env_locations[] = {
>   	ENVL_NOWHERE,
>   	ENVL_EXT4,
>   	ENVL_FAT,
> +	ENVL_SPI_FLASH,
>   };
>   
>   enum env_location env_get_location(enum env_operation op, int prio)
> diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
> index 70c757640c0..22de4acbd88 100644
> --- a/configs/sandbox64_defconfig
> +++ b/configs/sandbox64_defconfig
> @@ -2,10 +2,13 @@ CONFIG_TEXT_BASE=0
>   CONFIG_SYS_MALLOC_LEN=0x6000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_ENV_SIZE=0x2000
> +CONFIG_ENV_OFFSET=0x0
> +CONFIG_ENV_SECT_SIZE=0x1000
>   CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
>   CONFIG_DM_RESET=y
>   CONFIG_SYS_LOAD_ADDR=0x0
>   CONFIG_PRE_CON_BUF_ADDR=0x100000
> +CONFIG_ENV_OFFSET_REDUND=0x10000
>   CONFIG_PCI=y
>   CONFIG_SANDBOX64=y
>   CONFIG_DEBUG_UART=y
> @@ -106,6 +109,10 @@ CONFIG_OF_LIVE=y
>   CONFIG_ENV_IS_NOWHERE=y
>   CONFIG_ENV_IS_IN_EXT4=y
>   CONFIG_ENV_IS_IN_FAT=y

This line does not exist

> +CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_ENV_SECT_SIZE_AUTO=y
> +CONFIG_ENV_REDUNDANT=y
> +CONFIG_ENV_REDUNDANT_UPGRADE=y
>   CONFIG_ENV_EXT4_INTERFACE="host"
>   CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
>   CONFIG_ENV_IMPORT_FDT=y
> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
> index dfdaaff1eff..97f5d5dc074 100644
> --- a/configs/sandbox_defconfig
> +++ b/configs/sandbox_defconfig
> @@ -2,9 +2,12 @@ CONFIG_TEXT_BASE=0
>   CONFIG_SYS_MALLOC_LEN=0x6000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_ENV_SIZE=0x2000
> +CONFIG_ENV_OFFSET=0x0
> +CONFIG_ENV_SECT_SIZE=0x1000
>   CONFIG_DM_RESET=y
>   CONFIG_SYS_LOAD_ADDR=0x0
>   CONFIG_PRE_CON_BUF_ADDR=0xf0000
> +CONFIG_ENV_OFFSET_REDUND=0x10000
>   CONFIG_PCI=y
>   CONFIG_DEBUG_UART=y
>   CONFIG_SYS_MEMTEST_START=0x00100000
> @@ -154,6 +157,10 @@ CONFIG_OF_LIVE=y
>   CONFIG_ENV_IS_NOWHERE=y
>   CONFIG_ENV_IS_IN_EXT4=y
>   CONFIG_ENV_IS_IN_FAT=y

This line does not exist.

Best regards

Heinrich

> +CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_ENV_SECT_SIZE_AUTO=y
> +CONFIG_ENV_REDUNDANT=y
> +CONFIG_ENV_REDUNDANT_UPGRADE=y
>   CONFIG_ENV_EXT4_INTERFACE="host"
>   CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
>   CONFIG_ENV_IMPORT_FDT=y