powerpc/mpc85xx: socrates: Remove misuse of env is nowhere driver

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 <stefan.herbrechtsmeier@weidmueller.com>

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 02e6afb099948506412cc963813aba6eafa128a5..1d63c81a9c81fde37e73cf813ac8c4cfb96e0f72 100644 (file)
--- 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 df8b31b4e7b702cf85731e868881c288e9fd1cb2..c926da1370ce54192538d8809a30ac5dae01def3 100644 (file)
--- 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