Skip to content

Commit

Permalink
powerpc/mpc85xx: socrates: Remove misuse of env is nowhere driver
Browse files Browse the repository at this point in the history
When using a list of writeable variables, the initial values come from
the built-in default environment since commit 5ab8105
("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>
  • Loading branch information
herbrechtsmeier authored and trini committed May 16, 2023
1 parent b16fd7f commit 35a6fdc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
17 changes: 0 additions & 17 deletions board/socrates/socrates.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion configs/socrates_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 35a6fdc

Please sign in to comment.