From: Stefan Herbrechtsmeier <[email protected]>
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.
Signed-off-by: Stefan Herbrechtsmeier <[email protected]>
---
Changes in v2:
- Added
board/socrates/socrates.c | 17 -----------------
configs/socrates_defconfig | 1 -
2 files changed, 18 deletions(-)
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 02e6afb099..1d63c81a9c 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -13,7 +13,6 @@
#include <common.h>
#include <clock_legacy.h>
#include <env.h>
-#include <env_internal.h>
#include <init.h>
#include <pci.h>
#include <uuid.h>
@@ -222,19 +221,3 @@ int get_serial_clock(void)
{
return 333333330;
}
-
-enum env_location env_get_location(enum env_operation op, int prio)
-{
- if (op == ENVOP_SAVE || op == ENVOP_ERASE)
- return ENVL_FLASH;
-
- switch (prio) {
- case 0:
- return ENVL_NOWHERE;
- case 1:
- return ENVL_FLASH;
- default:
- return ENVL_UNKNOWN;
- }
- return ENVL_UNKNOWN;
-}
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index df8b31b4e7..c926da1370 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
--
2.30.2
