Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-01 17:12:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

env: Remove unused NEEDS_MANUAL_RELOC code bits

Browse source 
The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2023-09-06 23:29:57 +02:00 • committed by Tom Rini
parent db87cd50f4
commit decbc81844
4 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
env/callback.c vendored
View file

@ -9,10 +9,6 @@
#include <env_internal.h> #include <env_internal.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
DECLARE_GLOBAL_DATA_PTR;
#endif
/* /*
* Look up a callback function pointer by name * Look up a callback function pointer by name
*/ */
@ -71,11 +67,7 @@ void env_callback_init(struct env_entry *var_entry)
if (!ret && strlen(callback_name)) { if (!ret && strlen(callback_name)) {
clbkp = find_env_callback(callback_name); clbkp = find_env_callback(callback_name);
if (clbkp != NULL) if (clbkp != NULL)
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
var_entry->callback = clbkp->callback + gd->reloc_off;
#else
var_entry->callback = clbkp->callback; var_entry->callback = clbkp->callback;
#endif
} }
} }
@ -112,11 +104,7 @@ static int set_callback(const char *name, const char *value, void *priv)
/* assign the requested callback */ /* assign the requested callback */
clbkp = find_env_callback(value); clbkp = find_env_callback(value);
if (clbkp != NULL) if (clbkp != NULL)
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
ep->callback = clbkp->callback + gd->reloc_off;
#else
ep->callback = clbkp->callback; ep->callback = clbkp->callback;
#endif
} }
} }

4
env/common.c vendored
View file

@ -428,10 +428,6 @@ int env_export(env_t *env_out)
void env_relocate(void) void env_relocate(void)
{ {
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
env_fix_drivers();
env_htab.change_ok += gd->reloc_off;
#endif
if (gd->env_valid == ENV_INVALID) { if (gd->env_valid == ENV_INVALID) {
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
/* Environment not changable */ /* Environment not changable */

23
env/env.c vendored
View file

@ -14,29 +14,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
void env_fix_drivers(void)
{
struct env_driver *drv;
const int n_ents = ll_entry_count(struct env_driver, env_driver);
struct env_driver *entry;
drv = ll_entry_start(struct env_driver, env_driver);
for (entry = drv; entry != drv + n_ents; entry++) {
if (entry->name)
entry->name += gd->reloc_off;
if (entry->load)
entry->load += gd->reloc_off;
if (entry->save)
entry->save += gd->reloc_off;
if (entry->erase)
entry->erase += gd->reloc_off;
if (entry->init)
entry->init += gd->reloc_off;
}
}
#endif
static struct env_driver *_env_driver_lookup(enum env_location loc) static struct env_driver *_env_driver_lookup(enum env_location loc)
{ {
struct env_driver *drv; struct env_driver *drv;

5
include/env.h
View file

@ -239,11 +239,6 @@ int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr);
*/ */
int eth_env_set_enetaddr(const char *name, const uint8_t *enetaddr); int eth_env_set_enetaddr(const char *name, const uint8_t *enetaddr);
/**
* env_fix_drivers() - Updates envdriver as per relocation
*/
void env_fix_drivers(void);
/** /**
* env_set_default_vars() - reset variables to their default value * env_set_default_vars() - reset variables to their default value
* *