mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
4415f1d1f1
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>
137 lines
2.7 KiB
C
137 lines
2.7 KiB
C
/*
|
|
* (c) Copyright 2011 by Tigris Elektronik GmbH
|
|
*
|
|
* Author:
|
|
* Maximilian Schwerin <mvs@tigris.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
#include <environment.h>
|
|
#include <linux/stddef.h>
|
|
#include <malloc.h>
|
|
#include <memalign.h>
|
|
#include <search.h>
|
|
#include <errno.h>
|
|
#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;
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int env_init(void)
|
|
{
|
|
/* use default */
|
|
gd->env_addr = (ulong)&default_environment[0];
|
|
gd->env_valid = ENV_VALID;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CMD_SAVEENV
|
|
int saveenv(void)
|
|
{
|
|
env_t env_new;
|
|
struct blk_desc *dev_desc = NULL;
|
|
disk_partition_t info;
|
|
int dev, part;
|
|
int err;
|
|
loff_t size;
|
|
|
|
err = env_export(&env_new);
|
|
if (err)
|
|
return err;
|
|
|
|
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART,
|
|
&dev_desc, &info, 1);
|
|
if (part < 0)
|
|
return 1;
|
|
|
|
dev = dev_desc->devnum;
|
|
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
|
printf("\n** Unable to use %s %d:%d for saveenv **\n",
|
|
CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
return 1;
|
|
}
|
|
|
|
err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
|
|
&size);
|
|
if (err == -1) {
|
|
printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
|
|
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
return 1;
|
|
}
|
|
|
|
puts("done\n");
|
|
return 0;
|
|
}
|
|
#endif /* CMD_SAVEENV */
|
|
|
|
#ifdef LOADENV
|
|
void env_relocate_spec(void)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
|
|
struct blk_desc *dev_desc = NULL;
|
|
disk_partition_t info;
|
|
int dev, part;
|
|
int err;
|
|
|
|
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART,
|
|
&dev_desc, &info, 1);
|
|
if (part < 0)
|
|
goto err_env_relocate;
|
|
|
|
dev = dev_desc->devnum;
|
|
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
|
printf("\n** Unable to use %s %d:%d for loading the env **\n",
|
|
CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
goto err_env_relocate;
|
|
}
|
|
|
|
err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
|
|
if (err == -1) {
|
|
printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
|
|
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
goto err_env_relocate;
|
|
}
|
|
|
|
env_import(buf, 1);
|
|
return;
|
|
|
|
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,
|
|
};
|