projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: zynq: Do not select options if SPL is not enabled
[oweals/u-boot.git]
/
common
/
env_common.c
diff --git
a/common/env_common.c
b/common/env_common.c
index cd7b4cd1dfb7c3a59bfad6f1ae6c5fe5bb07dd8f..af59c72e1fd7d502f4899d99e8a1458cc7354d13 100644
(file)
--- a/
common/env_common.c
+++ b/
common/env_common.c
@@
-27,12
+27,10
@@
struct hsearch_data env_htab = {
.change_ok = env_flags_validate,
};
.change_ok = env_flags_validate,
};
-
static uchar __
env_get_char_spec(int index)
+
__weak uchar
env_get_char_spec(int index)
{
return *((uchar *)(gd->env_addr + index));
}
{
return *((uchar *)(gd->env_addr + index));
}
-uchar env_get_char_spec(int)
- __attribute__((weak, alias("__env_get_char_spec")));
static uchar env_get_char_init(int index)
{
static uchar env_get_char_init(int index)
{
@@
-120,7
+118,7
@@
void set_default_env(const char *s)
}
if (himport_r(&env_htab, (char *)default_environment,
}
if (himport_r(&env_htab, (char *)default_environment,
- sizeof(default_environment), '\0', flags,
+ sizeof(default_environment), '\0', flags,
0,
0, NULL) == 0)
error("Environment import failed: errno = %d\n", errno);
0, NULL) == 0)
error("Environment import failed: errno = %d\n", errno);
@@
-137,7
+135,7
@@
int set_default_vars(int nvars, char * const vars[])
*/
return himport_r(&env_htab, (const char *)default_environment,
sizeof(default_environment), '\0',
*/
return himport_r(&env_htab, (const char *)default_environment,
sizeof(default_environment), '\0',
- H_NOCLEAR | H_INTERACTIVE, nvars, vars);
+ H_NOCLEAR | H_INTERACTIVE,
0,
nvars, vars);
}
#ifdef CONFIG_ENV_AES
}
#ifdef CONFIG_ENV_AES
@@
-214,7
+212,7
@@
int env_import(const char *buf, int check)
return ret;
}
return ret;
}
- if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
+ if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
0,
0, NULL)) {
gd->flags |= GD_FLG_ENV_READY;
return 1;
0, NULL)) {
gd->flags |= GD_FLG_ENV_READY;
return 1;