From bf95df44ff69e3e365603e3e30664ec41bfe0c65 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Mon, 26 Dec 2011 03:33:10 +0000 Subject: env: factor out the env_get_char_spec() function env_get_char_spec() function is duplicated across multiple environment files. Remove the duplication by providing a default implementation. Add "weak" declaration, so the default implementation can be overridden. Signed-off-by: Igor Grinberg --- common/env_nvram.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'common/env_nvram.c') diff --git a/common/env_nvram.c b/common/env_nvram.c index 726eaac..6483db3 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -59,18 +59,16 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; char *env_name_spec = "NVRAM"; +#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE uchar env_get_char_spec(int index) { -#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE uchar c; nvram_read(&c, CONFIG_ENV_ADDR + index, 1); return c; -#else - return *((uchar *)(gd->env_addr + index)); -#endif } +#endif void env_relocate_spec(void) { -- cgit v1.1