From 75de597d2d91b1102584d4b641daf592d894207e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2017 12:21:55 -0600 Subject: [PATCH] env: common: Drop env_get_char_memory() 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 Reviewed-by: Tom Rini --- env/common.c | 7 ------- 1 file changed, 7 deletions(-) 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); } -- 2.39.5