From 4415f1d1f1c57d43f6bc8ff156554c2b2da45b52 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2017 12:21:58 -0600 Subject: env: Create a location driver for each location Set up a location driver for each supported environment location. At present this just points to the global functions and is not used. A later patch will switch this over to use private functions in each driver. There are several special cases here in various drivers to handle peculiarities of certain boards: 1. Some boards define CONFIG_ENV_IS_IN_FAT and CONFIG_SPL_ENV_SUPPORT but do not actually load the environment in SPL. The env load code was optimised out before but with the driver, it is not. Therefore a special case is added to env/fat.c. The correct fix (depending on board testing might be to disable CONFIG_SPL_ENV_SUPPORT. 2. A similar situations happens with CONFIG_ENV_IS_IN_FLASH. Some boards do not actually load the environment in SPL, so to reduce code size we need to drop that code. A similar fix may be possible with these boards, or it may be possible to adjust the environment CONFIG settings. Added to the above is that the CONFIG_SPL_ENV_SUPPORT option does not apply when the environment is in flash. Obviously the above has been discovered through painful and time-consuming trial and error. Hopefully board maintainers can take a look and figure out what is actually needed. Signed-off-by: Simon Glass --- env/fat.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'env/fat.c') diff --git a/env/fat.c b/env/fat.c index 129b945a2f..abf6d115b7 100644 --- a/env/fat.c +++ b/env/fat.c @@ -19,6 +19,18 @@ #include #include +#ifdef CONFIG_SPL_BUILD +/* TODO(sjg@chromium.org): Figure out why this is needed */ +# if !defined(CONFIG_TARGET_AM335X_EVM) || defined(CONFIG_SPL_OS_BOOT) +# define LOADENV +# endif +#else +# define LOADENV +# if defined(CONFIG_CMD_SAVEENV) +# define CMD_SAVEENV +# endif +#endif + char *env_name_spec = "FAT"; env_t *env_ptr; @@ -34,7 +46,7 @@ int env_init(void) return 0; } -#ifdef CONFIG_CMD_SAVEENV +#ifdef CMD_SAVEENV int saveenv(void) { env_t env_new; @@ -72,8 +84,9 @@ int saveenv(void) puts("done\n"); return 0; } -#endif /* CONFIG_CMD_SAVEENV */ +#endif /* CMD_SAVEENV */ +#ifdef LOADENV void env_relocate_spec(void) { ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); @@ -108,3 +121,16 @@ void env_relocate_spec(void) err_env_relocate: set_default_env(NULL); } +#endif /* LOADENV */ + +U_BOOT_ENV_LOCATION(fat) = { + .location = ENVL_FAT, + .get_char = env_get_char_spec, +#ifdef LOADENV + .load = env_relocate_spec, +#endif +#ifdef CMD_SAVEENV + .save = env_save_ptr(saveenv), +#endif + .init = env_init, +}; -- cgit v1.2.3