From a69d0f60e500a7ba0be8d33fb6321e3b38cd21df Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2017 12:22:06 -0600 Subject: 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 Signed-off-by: Simon Glass --- include/environment.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'include/environment.h') diff --git a/include/environment.h b/include/environment.h index 584fd7216d..1df243462e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -171,7 +171,6 @@ extern const unsigned char default_environment[]; extern env_t *env_ptr; extern void env_relocate_spec(void); -extern unsigned char env_get_char_spec(int); #if defined(CONFIG_NEEDS_MANUAL_RELOC) extern void env_reloc(void); @@ -281,9 +280,6 @@ struct env_driver { extern struct hsearch_data env_htab; -/* Function that returns a character from the environment */ -unsigned char env_get_char(int); - /* Function that updates CRC of the enironment */ void env_crc_update(void); @@ -314,6 +310,16 @@ int env_import_redund(const char *buf1, const char *buf2); */ struct env_driver *env_driver_lookup_default(void); +/** + * env_get_char() - Get a character from the early environment + * + * This reads from the pre-relocation environemnt + * + * @index: Index of character to read (0 = first) + * @return character read, or -ve on error + */ +int env_get_char(int index); + #endif /* DO_DEPS_ONLY */ #endif /* _ENVIRONMENT_H_ */ -- cgit v1.2.1