Message ID | 20170803182217.149285-9-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Thu, Aug 03, 2017 at 12:21:55PM -0600, Simon Glass wrote: > This function is the same as env_get_char_spec() apart from dropping the > brackets. Drop the brackets from env_get_char_spec() and use that instead > of env_get_char_memory(). > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/env/common.c b/env/common.c index f0ffe4ed73..842c0f7fd1 100644 --- a/env/common.c +++ b/env/common.c @@ -28,11 +28,6 @@ struct hsearch_data env_htab = { }; __weak uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - -static uchar env_get_char_memory(int index) { return *(uchar *)(gd->env_addr + index); } @@ -42,8 +37,6 @@ 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 if (gd->flags & GD_FLG_RELOC) /* if relocated to RAM */ - return env_get_char_memory(index); else return env_get_char_spec(index); }