leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: Move get/set_default_env() to env.h

Browse Source 
Move these functions to the new header file and rename set_default_env()
to env_set_default() so that it has a consistent env_ prefix.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-08-01 09:47:00 -06:00 committed by Tom Rini
parent 1f3db0c135
commit 0ac7d722ed
15 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/mx6/opos6ul.c
View File

@ -128,7 +128,7 @@ int board_late_init(void)
/* In bootstrap don't use the env vars */
if (((reg & 0x3000000) >> 24) == 0x1) {
set_default_env(NULL, 0);
env_set_default(NULL, 0);
env_set("preboot", "");
}

2
board/phytec/pcm052/pcm052.c
View File

@ -377,7 +377,7 @@ int board_late_init(void)
if ((reg & SRC_SBMR1_BOOTCFG1_SDMMC) &&
!(reg & SRC_SBMR1_BOOTCFG1_MMC)) {
printf("------ SD card boot -------\n");
set_default_env("!LVFBootloader", 0);
env_set_default("!LVFBootloader", 0);
env_set("bootcmd",
"run prepare_install_bk4r1_envs; run install_bk4r1rs");
}

2
cmd/nvedit.c
View File

@ -814,7 +814,7 @@ static int do_env_default(cmd_tbl_t *cmdtp, int flag,
debug("Final value for argc=%d\n", argc);
if (all && (argc == 0)) {
/* Reset the whole environment */
set_default_env("## Resetting to default environment\n",
env_set_default("## Resetting to default environment\n",
env_flag);
return 0;
}

2
common/board_r.c
View File

@ -448,7 +448,7 @@ static int initr_env(void)
if (should_load_env())
env_relocate();
else
set_default_env(NULL, 0);
env_set_default(NULL, 0);
#ifdef CONFIG_OF_CONTROL
env_set_hex("fdtcontroladdr",
(unsigned long)map_to_sysmem(gd->fdt_blob));

2
common/spl/spl_dfu.c
View File

@ -39,7 +39,7 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr)
int ret;
/* set default environment */
set_default_env(NULL, 0);
env_set_default(NULL, 0);
str_env = env_get(dfu_alt_info);
if (!str_env) {
pr_err("\"%s\" env variable not defined!\n", dfu_alt_info);

14
env/common.c vendored
View File

@ -62,7 +62,7 @@ char *env_get_default(const char *name)
return ret_val;
}
void set_default_env(const char *s, int flags)
void env_set_default(const char *s, int flags)
{
if (sizeof(default_environment) > ENV_SIZE) {
puts("*** Error - default environment is too large\n\n");
@ -118,7 +118,7 @@ int env_import(const char *buf, int check)
memcpy(&crc, &ep->crc, sizeof(crc));
if (crc32(0, ep->data, ENV_SIZE) != crc) {
set_default_env("bad CRC", 0);
env_set_default("bad CRC", 0);
return -ENOMSG; /* needed for env_load() */
}
}
@ -131,7 +131,7 @@ int env_import(const char *buf, int check)
pr_err("Cannot import environment: errno = %d\n", errno);
set_default_env("import failed", 0);
env_set_default("import failed", 0);
return -EIO;
}
@ -156,7 +156,7 @@ int env_import_redund(const char *buf1, int buf1_read_fail,
}
if (buf1_read_fail && buf2_read_fail) {
set_default_env("bad env area", 0);
env_set_default("bad env area", 0);
return -EIO;
} else if (!buf1_read_fail && buf2_read_fail) {
gd->env_valid = ENV_VALID;
@ -172,7 +172,7 @@ int env_import_redund(const char *buf1, int buf1_read_fail,
tmp_env2->crc;
if (!crc1_ok && !crc2_ok) {
set_default_env("bad CRC", 0);
env_set_default("bad CRC", 0);
return -ENOMSG; /* needed for env_load() */
} else if (crc1_ok && !crc2_ok) {
gd->env_valid = ENV_VALID;
@ -236,10 +236,10 @@ void env_relocate(void)
if (gd->env_valid == ENV_INVALID) {
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
/* Environment not changable */
set_default_env(NULL, 0);
env_set_default(NULL, 0);
#else
bootstage_error(BOOTSTAGE_ID_NET_CHECKSUM);
set_default_env("bad CRC", 0);
env_set_default("bad CRC", 0);
#endif
} else {
env_load();

3
env/ext4.c vendored
View File

@ -21,6 +21,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <linux/stddef.h>
#include <malloc.h>
@ -127,7 +128,7 @@ static int env_ext4_load(void)
return env_import(buf, 1);
err_env_relocate:
set_default_env(NULL, 0);
env_set_default(NULL, 0);
return -EIO;
}

3
env/fat.c vendored
View File

@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <linux/stddef.h>
#include <malloc.h>
@ -122,7 +123,7 @@ static int env_fat_load(void)
return env_import(buf, 1);
err_env_relocate:
set_default_env(NULL, 0);
env_set_default(NULL, 0);
return -EIO;
}

5
env/mmc.c vendored
View File

@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <fdtdec.h>
#include <linux/stddef.h>
@ -346,7 +347,7 @@ fini:
fini_mmc_for_env(mmc);
err:
if (ret)
set_default_env(errmsg, 0);
env_set_default(errmsg, 0);
#endif
return ret;
@ -387,7 +388,7 @@ fini:
fini_mmc_for_env(mmc);
err:
if (ret)
set_default_env(errmsg, 0);
env_set_default(errmsg, 0);
#endif
return ret;
}

7
env/nand.c vendored
View File

@ -15,6 +15,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <linux/stddef.h>
#include <malloc.h>
@ -325,7 +326,7 @@ static int env_nand_load(void)
tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
if (tmp_env1 == NULL || tmp_env2 == NULL) {
puts("Can't allocate buffers for environment\n");
set_default_env("malloc() failed", 0);
env_set_default("malloc() failed", 0);
ret = -EIO;
goto done;
}
@ -364,14 +365,14 @@ static int env_nand_load(void)
if (mtd && !get_nand_env_oob(mtd, &nand_env_oob_offset)) {
printf("Found Environment offset in OOB..\n");
} else {
set_default_env("no env offset in OOB", 0);
env_set_default("no env offset in OOB", 0);
return;
}
#endif
ret = readenv(CONFIG_ENV_OFFSET, (u_char *)buf);
if (ret) {
set_default_env("readenv() failed", 0);
env_set_default("readenv() failed", 0);
return -EIO;
}

3
env/sata.c vendored
View File

@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <linux/stddef.h>
#include <errno.h>
@ -106,7 +107,7 @@ static void env_sata_load(void)
}
if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
set_default_env(NULL, 0);
env_set_default(NULL, 0);
return -EIO;
}

11
env/sf.c vendored
View File

@ -10,6 +10,7 @@
*/
#include <common.h>
#include <dm.h>
#include <env.h>
#include <environment.h>
#include <malloc.h>
#include <spi.h>
@ -48,7 +49,7 @@ static int setup_flash_device(void)
CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE,
&new);
if (ret) {
set_default_env("spi_flash_probe_bus_cs() failed", 0);
env_set_default("spi_flash_probe_bus_cs() failed", 0);
return ret;
}
@ -60,7 +61,7 @@ static int setup_flash_device(void)
CONFIG_ENV_SPI_CS,
CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
if (!env_flash) {
set_default_env("spi_flash_probe() failed", 0);
env_set_default("spi_flash_probe() failed", 0);
return -EIO;
}
}
@ -161,7 +162,7 @@ static int env_sf_load(void)
tmp_env2 = (env_t *)memalign(ARCH_DMA_MINALIGN,
CONFIG_ENV_SIZE);
if (!tmp_env1 || !tmp_env2) {
set_default_env("malloc() failed", 0);
env_set_default("malloc() failed", 0);
ret = -EIO;
goto out;
}
@ -256,7 +257,7 @@ static int env_sf_load(void)
buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
if (!buf) {
set_default_env("malloc() failed", 0);
env_set_default("malloc() failed", 0);
return -EIO;
}
@ -267,7 +268,7 @@ static int env_sf_load(void)
ret = spi_flash_read(env_flash,
CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
if (ret) {
set_default_env("spi_flash_read() failed", 0);
env_set_default("spi_flash_read() failed", 0);
goto err_read;
}

7
env/ubi.c vendored
View File

@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <errno.h>
#include <malloc.h>
@ -123,7 +124,7 @@ static int env_ubi_load(void)
if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
printf("\n** Cannot find mtd partition \"%s\"\n",
CONFIG_ENV_UBI_PART);
set_default_env(NULL, 0);
env_set_default(NULL, 0);
return -EIO;
}
@ -160,14 +161,14 @@ static int env_ubi_load(void)
if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
printf("\n** Cannot find mtd partition \"%s\"\n",
CONFIG_ENV_UBI_PART);
set_default_env(NULL, 0);
env_set_default(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);
env_set_default(NULL, 0);
return -EIO;
}

11
include/env.h
View File

@ -257,4 +257,15 @@ int env_export(struct environment_s *env_out);
int env_import_redund(const char *buf1, int buf1_read_fail,
const char *buf2, int buf2_read_fail);
/**
* env_get_default() - Look up a variable from the default environment
*
* @name: Variable to look up
* @return value if found, NULL if not found in default environment
*/
char *env_get_default(const char *name);
/* [re]set to the default environment */
void env_set_default(const char *s, int flags);
#endif

6
include/environment.h
View File

@ -265,12 +265,6 @@ struct env_driver {
extern struct hsearch_data env_htab;
/* Look up the variable from the default environment */
char *env_get_default(const char *name);
/* [re]set to the default environment */
void set_default_env(const char *s, int flags);
/**
* env_get_char() - Get a character from the early environment
*