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.

3 files changed, 0 insertions, 54 deletions

diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 770f3d7d0d5..4dcf3f396b8 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -30,7 +30,6 @@
 #include <bmp_logo.h>
 #include <dm/root.h>
 #include <env.h>
-#include <env_internal.h>
 #include <i2c_eeprom.h>
 #include <i2c.h>
 #include <micrel.h>
@@ -529,22 +528,3 @@ int embedded_dtb_select(void)
 	return 0;
 }
 #endif
-
-enum env_location env_get_location(enum env_operation op, int prio)
-{
-	if (op == ENVOP_SAVE || op == ENVOP_ERASE)
-		return ENVL_SPI_FLASH;
-
-	switch (prio) {
-	case 0:
-		return ENVL_NOWHERE;
-
-	case 1:
-		return ENVL_SPI_FLASH;
-
-	default:
-		return ENVL_UNKNOWN;
-	}
-
-	return ENVL_UNKNOWN;
-}
diff --git a/board/bosch/acc/acc.c b/board/bosch/acc/acc.c
index 4a0603d0f3f..732d823826b 100644
--- a/board/bosch/acc/acc.c
+++ b/board/bosch/acc/acc.c
@@ -12,7 +12,6 @@
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/device-internal.h>
 #include <env.h>
-#include <env_internal.h>
 #include <hang.h>
 #include <init.h>
 #include <linux/delay.h>
@@ -236,22 +235,6 @@ static void unset_early_gpio(void)
 	gpio_set_value(GPIO_TOUCH_RESET, 1);
 }
 
-enum env_location env_get_location(enum env_operation op, int prio)
-{
-	if (op == ENVOP_SAVE || op == ENVOP_ERASE)
-		return ENVL_MMC;
-
-	switch (prio) {
-	case 0:
-		return ENVL_NOWHERE;
-
-	case 1:
-		return ENVL_MMC;
-	}
-
-	return ENVL_UNKNOWN;
-}
-
 int board_late_init(void)
 {
 	struct board_info *binfo = detect_board();
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 02e6afb0999..1d63c81a9c8 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;
-}