linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

env: Create a location driver for each location

Browse Source 
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 <sjg@chromium.org>
This commit is contained in:
Simon Glass
2017-08-03 12:21:58 -06:00
committed by Tom Rini
parent 42a8180d19
commit 4415f1d1f1
15 changed files with 246 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
env/fat.c vendored
View File

@ -19,6 +19,18 @@
#include <fat.h>
#include <mmc.h>
#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,
};