mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
c5d548a9f8
The function set_default_env() sets the hashtable flags for import_r(). Formally set_default_env() doesn't accept flags from its callers. In practice the caller can (un)set the H_INTERACTIVE flag, but it has to be done using the first character of the function's string argument. Other flags like H_FORCE can't be set by the caller. Change the function to accept flags argument. The benefits are: 1. The caller will have to explicitly set the H_INTERACTIVE flag, instead of un-setting it using a special char in a string. 2. Add the ability to propagate flags from the caller to himport(), especially the H_FORCE flag from do_env_default() in nvedit.c that currently gets ignored for "env default -a -f" commands. 3. Flags and messages will not be coupled together. A caller will be able to set flags without passing a string and vice versa. Please note: The propagation of H_FORCE from do_env_default() does not introduce any functional changes, because currently himport_r() is set to destroy the old environment regardless if H_FORCE flag is set or not. More changes are needed to utilize the propagation of H_FORCE. Signed-off-by: Yaniv Levinsky <yaniv.levinsky@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
173 lines
4.5 KiB
C
173 lines
4.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (c) Copyright 2012 by National Instruments,
|
|
* Joe Hershberger <joe.hershberger@ni.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
#include <environment.h>
|
|
#include <errno.h>
|
|
#include <malloc.h>
|
|
#include <memalign.h>
|
|
#include <search.h>
|
|
#include <ubi_uboot.h>
|
|
#undef crc32
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#ifdef CONFIG_CMD_SAVEENV
|
|
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
static int env_ubi_save(void)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
|
|
int ret;
|
|
|
|
ret = env_export(env_new);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
|
|
printf("\n** Cannot find mtd partition \"%s\"\n",
|
|
CONFIG_ENV_UBI_PART);
|
|
return 1;
|
|
}
|
|
|
|
if (gd->env_valid == ENV_VALID) {
|
|
puts("Writing to redundant UBI... ");
|
|
if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
|
|
(void *)env_new, CONFIG_ENV_SIZE)) {
|
|
printf("\n** Unable to write env to %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART,
|
|
CONFIG_ENV_UBI_VOLUME_REDUND);
|
|
return 1;
|
|
}
|
|
} else {
|
|
puts("Writing to UBI... ");
|
|
if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME,
|
|
(void *)env_new, CONFIG_ENV_SIZE)) {
|
|
printf("\n** Unable to write env to %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART,
|
|
CONFIG_ENV_UBI_VOLUME);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
puts("done\n");
|
|
|
|
gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
|
|
|
|
return 0;
|
|
}
|
|
#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
|
|
static int env_ubi_save(void)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
|
|
int ret;
|
|
|
|
ret = env_export(env_new);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
|
|
printf("\n** Cannot find mtd partition \"%s\"\n",
|
|
CONFIG_ENV_UBI_PART);
|
|
return 1;
|
|
}
|
|
|
|
if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME, (void *)env_new,
|
|
CONFIG_ENV_SIZE)) {
|
|
printf("\n** Unable to write env to %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
|
|
return 1;
|
|
}
|
|
|
|
puts("done\n");
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
|
|
#endif /* CONFIG_CMD_SAVEENV */
|
|
|
|
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
static int env_ubi_load(void)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(char, env1_buf, CONFIG_ENV_SIZE);
|
|
ALLOC_CACHE_ALIGN_BUFFER(char, env2_buf, CONFIG_ENV_SIZE);
|
|
int read1_fail, read2_fail;
|
|
env_t *tmp_env1, *tmp_env2;
|
|
|
|
/*
|
|
* In case we have restarted u-boot there is a chance that buffer
|
|
* contains old environment (from the previous boot).
|
|
* If UBI volume is zero size, ubi_volume_read() doesn't modify the
|
|
* buffer.
|
|
* We need to clear buffer manually here, so the invalid CRC will
|
|
* cause setting default environment as expected.
|
|
*/
|
|
memset(env1_buf, 0x0, CONFIG_ENV_SIZE);
|
|
memset(env2_buf, 0x0, CONFIG_ENV_SIZE);
|
|
|
|
tmp_env1 = (env_t *)env1_buf;
|
|
tmp_env2 = (env_t *)env2_buf;
|
|
|
|
if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
|
|
printf("\n** Cannot find mtd partition \"%s\"\n",
|
|
CONFIG_ENV_UBI_PART);
|
|
set_default_env(NULL, 0);
|
|
return -EIO;
|
|
}
|
|
|
|
read1_fail = ubi_volume_read(CONFIG_ENV_UBI_VOLUME, (void *)tmp_env1,
|
|
CONFIG_ENV_SIZE);
|
|
if (read1_fail)
|
|
printf("\n** Unable to read env from %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
|
|
|
|
read2_fail = ubi_volume_read(CONFIG_ENV_UBI_VOLUME_REDUND,
|
|
(void *)tmp_env2, CONFIG_ENV_SIZE);
|
|
if (read2_fail)
|
|
printf("\n** Unable to read redundant env from %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME_REDUND);
|
|
|
|
return env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2,
|
|
read2_fail);
|
|
}
|
|
#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
|
|
static int env_ubi_load(void)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
|
|
|
|
/*
|
|
* In case we have restarted u-boot there is a chance that buffer
|
|
* contains old environment (from the previous boot).
|
|
* If UBI volume is zero size, ubi_volume_read() doesn't modify the
|
|
* buffer.
|
|
* We need to clear buffer manually here, so the invalid CRC will
|
|
* cause setting default environment as expected.
|
|
*/
|
|
memset(buf, 0x0, CONFIG_ENV_SIZE);
|
|
|
|
if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
|
|
printf("\n** Cannot find mtd partition \"%s\"\n",
|
|
CONFIG_ENV_UBI_PART);
|
|
set_default_env(NULL, 0);
|
|
return -EIO;
|
|
}
|
|
|
|
if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
|
|
printf("\n** Unable to read env from %s:%s **\n",
|
|
CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
|
|
set_default_env(NULL, 0);
|
|
return -EIO;
|
|
}
|
|
|
|
return env_import(buf, 1);
|
|
}
|
|
#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
|
|
|
|
U_BOOT_ENV_LOCATION(ubi) = {
|
|
.location = ENVL_UBI,
|
|
.load = env_ubi_load,
|
|
.save = env_save_ptr(env_ubi_save),
|
|
};
|