[PATCH v2 12/12] env: Remove support for read-write default_environment[]

Marek Behún
2021-11-03T23:25:50Z

From: Marek Behún <marek.behun@nic.cz>

Since the default_environment[] buffer is not overwritten anymore by any
board, remove support for read-write default_environment[].

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/env_default.h | 2 --
include/env_internal.h | 4 ----
2 files changed, 6 deletions(-)

diff --git a/include/env_default.h b/include/env_default.h
index 23430dc70d..a1bdf97d38 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -19,8 +19,6 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
{
#elif defined(DEFAULT_ENV_INSTANCE_STATIC)
static char default_environment[] = {
-#elif defined(DEFAULT_ENV_IS_RW)
-char default_environment[] = {
#else
const char default_environment[] = {
#endif
diff --git a/include/env_internal.h b/include/env_internal.h
index f74927cd64..e0fc3e0070 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -111,11 +111,7 @@ typedef struct environment_s {
extern env_t embedded_environment;
#endif /* ENV_IS_EMBEDDED */

-#ifdef DEFAULT_ENV_IS_RW
-extern char default_environment[];
-#else
extern const char default_environment[];
-#endif

#ifndef DO_DEPS_ONLY

--
2.32.0