]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "test: env: Add test for environment storage in SPI NOR"
authorTom Rini <trini@konsulko.com>
Wed, 7 Jan 2026 16:20:32 +0000 (10:20 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 7 Jan 2026 18:31:56 +0000 (12:31 -0600)
This patch series from Marek Vasut <marek.vasut+renesas@mailbox.org>
adds support for having a platform be able to convert from a
non-redundant envrionment to a redundant one at run-time.

Link: https://lore.kernel.org/r/20251223143130.16266-1-marek.vasut+renesas@mailbox.org
1  2 
configs/sandbox64_defconfig
configs/sandbox_defconfig

index 05134558d0072ad811c87793ea1c8e7ab9218b25,a0a5be0c1591c882aa3f7e1346ae27d6572ddbaf..440e5efa340500b19c58c6e252ca3e0248581428
@@@ -103,8 -107,12 +106,12 @@@ CONFIG_AMIGA_PARTITION=
  CONFIG_OF_CONTROL=y
  CONFIG_OF_LIVE=y
  CONFIG_ENV_IS_NOWHERE=y
 -CONFIG_ENV_IS_IN_EXT4=y
  CONFIG_ENV_IS_IN_FAT=y
 +CONFIG_ENV_IS_IN_EXT4=y
+ 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
index 03369508caeed57f79498649d01c54024dc1cc01,2001b40bf074298b32c16bf66b57077cdc88fa80..92fb5f844b106a883feb863867e5b5eda0cb6a6c
@@@ -150,8 -154,12 +153,12 @@@ CONFIG_MAC_PARTITION=
  CONFIG_OF_CONTROL=y
  CONFIG_OF_LIVE=y
  CONFIG_ENV_IS_NOWHERE=y
 -CONFIG_ENV_IS_IN_EXT4=y
  CONFIG_ENV_IS_IN_FAT=y
 +CONFIG_ENV_IS_IN_EXT4=y
+ 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