summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-03 12:22:06 -0600
committerTom Rini <trini@konsulko.com>2017-08-15 20:50:29 -0400
commita69d0f60e500a7ba0be8d33fb6321e3b38cd21df (patch)
treeab631ce0b40ae99152d3b5776ad3f0a2acd0706d /env
parent6eeae42469d89d51f36b2bf1d74b091340194805 (diff)
env: Drop env_get_char_spec()
We only have a single implementation of this function now and it is called env_get_char(). Drop the old function and the weak version. Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env')
-rw-r--r--env/common.c14
-rw-r--r--env/env.c9
2 files changed, 3 insertions, 20 deletions
diff --git a/env/common.c b/env/common.c
index 842c0f7fd1..9b3a26859f 100644
--- a/env/common.c
+++ b/env/common.c
@@ -27,20 +27,6 @@ struct hsearch_data env_htab = {
.change_ok = env_flags_validate,
};
-__weak uchar env_get_char_spec(int index)
-{
- return *(uchar *)(gd->env_addr + index);
-}
-
-uchar env_get_char(int index)
-{
- /* if env is not set up, or crc was bad, use the default environment */
- if (!gd->env_valid)
- return default_environment[index];
- else
- return env_get_char_spec(index);
-}
-
/*
* Read an environment variable as a boolean
* Return -1 if variable does not exist (default to true)
diff --git a/env/env.c b/env/env.c
index ac6a583a02..a239d93156 100644
--- a/env/env.c
+++ b/env/env.c
@@ -69,11 +69,13 @@ struct env_driver *env_driver_lookup_default(void)
return drv;
}
-int env_get_char_new(int index)
+int env_get_char(int index)
{
struct env_driver *drv = env_driver_lookup_default();
int ret;
+ if (!gd->env_valid)
+ return default_environment[index];
if (!drv)
return -ENODEV;
if (!drv->get_char)
@@ -148,11 +150,6 @@ int env_init(void)
return 0;
}
-unsigned char env_get_char_spec(int index)
-{
- return *(uchar *)(gd->env_addr + index);
-}
-
void env_relocate_spec(void)
{
env_load();