diff options
| author | Tom Rini <[email protected]> | 2023-05-16 20:24:21 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-16 20:24:21 -0400 |
| commit | f9c58e0f1a3d4eda1f89c7cc02bcc3ad8bbf61a8 (patch) | |
| tree | 5b9de0f64aa1b5b2165739c562c604ad9a31ce2c /configs | |
| parent | 5d0b3dde115b0d26d414199678983d01b738ad1b (diff) | |
| parent | 8344162ea88a3dc8dc64b93709849e1d40ec8b40 (diff) | |
Merge branch '2023-05-16-remove-misuse-of-env-is-nowhere' into next
To quote the author:
When using a list of writeable variables, the initial values come from
the built-in default environment since commit 5ab81058364b
("env: Complete generic support for writable list"). Remove unnecessary
misuse of the env is nowhere driver as default environment.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/aristainetos2c_defconfig | 1 | ||||
| -rw-r--r-- | configs/aristainetos2ccslb_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx6q_bosch_acc_defconfig | 1 | ||||
| -rw-r--r-- | configs/socrates_defconfig | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig index db68b21c036..d1eb2abfae3 100644 --- a/configs/aristainetos2c_defconfig +++ b/configs/aristainetos2c_defconfig @@ -59,7 +59,6 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig index d369505e8bf..638976df95c 100644 --- a/configs/aristainetos2ccslb_defconfig +++ b/configs/aristainetos2ccslb_defconfig @@ -59,7 +59,6 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/imx6q_bosch_acc_defconfig b/configs/imx6q_bosch_acc_defconfig index 68a63f8a4b5..f65e7d1fe7a 100644 --- a/configs/imx6q_bosch_acc_defconfig +++ b/configs/imx6q_bosch_acc_defconfig @@ -77,7 +77,6 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_MULTI_DTB_FIT=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt-parent" CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_PART=1 diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index df8b31b4e7b..c926da1370c 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -68,7 +68,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe000000.nor_flash,nand0=socrates_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=fe000000.nor_flash:13312k(system1),13312k(system2),5120k(data),128k(env),128k(env-red),768k(u-boot);socrates_nand:256M(ubi-data1),-(ubi-data2)" # CONFIG_CMD_IRQ is not set CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xFFF00000 |