[PATCH 13/41] env: nvram: Drop CONFIG_SYS_NVRAM_ACCESS_ROUTINE

Tom Rini
2022-12-02T21:45:13Z

This option is unused anywhere and likely untested for quite a long
while. Drop this support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
env/nvram.c | 42 ++----------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/env/nvram.c b/env/nvram.c
index fb265235afc7..229c34f5367c 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -7,22 +7,6 @@
* Andreas Heppel <aheppel@sysgo.de>
*/

-/*
- * 09-18-2001 Andreas Heppel, Sysgo RTS GmbH <aheppel@sysgo.de>
- *
- * It might not be possible in all cases to use 'memcpy()' to copy
- * the environment to NVRAM, as the NVRAM might not be mapped into
- * the memory space. (I.e. this is the case for the BAB750). In those
- * cases it might be possible to access the NVRAM using a different
- * method. For example, the RTC on the BAB750 is accessible in IO
- * space using its address and data registers. To enable usage of
- * NVRAM in those cases I invented the functions 'nvram_read()' and
- * 'nvram_write()', which will be activated upon the configuration
- * #define CONFIG_SYS_NVRAM_ACCESS_ROUTINE. Note, that those functions are
- * strongly dependent on the used HW, and must be redefined for each
- * board that wants to use them.
- */
-
#include <common.h>
#include <command.h>
#include <env.h>
@@ -35,22 +19,14 @@

DECLARE_GLOBAL_DATA_PTR;

-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-extern void *nvram_read(void *dest, const long src, size_t count);
-extern void nvram_write(long dest, const void *src, size_t count);
-#else
static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-#endif

static int env_nvram_load(void)
{
char buf[CONFIG_ENV_SIZE];

-#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
- nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
-#else
memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
-#endif
+
return env_import(buf, 1, H_EXTERNAL);
}

@@ -63,12 +39,9 @@ static int env_nvram_save(void)
if (rcode)
return rcode;

-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
- nvram_write(CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE);
-#else
if (memcpy((char *)CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE) == NULL)
rcode = 1;
-#endif
+
return rcode;
}

@@ -79,19 +52,8 @@ static int env_nvram_save(void)
*/
static int env_nvram_init(void)
{
-#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
- ulong crc;
- uchar data[ENV_SIZE];
-
- nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
- nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);
-
- if (crc32(0, data, ENV_SIZE) == crc) {
- gd->env_addr = (ulong)CONFIG_ENV_ADDR + sizeof(long);
-#else
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
gd->env_addr = (ulong)&env_ptr->data;
-#endif
gd->env_valid = ENV_VALID;
} else {
gd->env_valid = ENV_INVALID;
--
2.25.1