diff options
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 16 | ||||
| -rw-r--r-- | env/Makefile | 1 | ||||
| -rw-r--r-- | env/common.c | 8 | ||||
| -rw-r--r-- | env/dataflash.c | 75 | ||||
| -rw-r--r-- | env/env.c | 4 | ||||
| -rw-r--r-- | env/sf.c | 2 |
6 files changed, 6 insertions, 100 deletions
diff --git a/env/Kconfig b/env/Kconfig index 024d4d79bd..02cb7cbb75 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -3,7 +3,6 @@ menu "Environment" choice prompt "Select the location of the environment" default ENV_IS_IN_MMC if ARCH_SUNXI - default ENV_IS_IN_MMC if ARCH_UNIPHIER default ENV_IS_IN_MMC if ARCH_EXYNOS4 default ENV_IS_IN_MMC if MX6SX || MX7D default ENV_IS_IN_MMC if TEGRA30 || TEGRA124 @@ -40,21 +39,6 @@ config ENV_IS_NOWHERE stored. U-Boot will therefore always start up with a default environment. -config ENV_IS_IN_DATAFLASH - bool "Environment in dataflash" - depends on !CHAIN_OF_TRUST - help - Define this if you have a DataFlash memory device which you - want to use for the environment. - - - CONFIG_ENV_OFFSET: - - CONFIG_ENV_ADDR: - - CONFIG_ENV_SIZE: - - These three #defines specify the offset and size of the - environment area within the total memory of your DataFlash placed - at the specified address. - config ENV_IS_IN_EEPROM bool "Environment in EEPROM" depends on !CHAIN_OF_TRUST diff --git a/env/Makefile b/env/Makefile index 8df5b9d4c9..7ce8231d9a 100644 --- a/env/Makefile +++ b/env/Makefile @@ -11,7 +11,6 @@ ifndef CONFIG_SPL_BUILD obj-y += attr.o obj-y += callback.o obj-y += flags.o -obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += dataflash.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o diff --git a/env/common.c b/env/common.c index b403bd5f6c..70715bb6e7 100644 --- a/env/common.c +++ b/env/common.c @@ -84,7 +84,7 @@ void set_default_env(const char *s) if (himport_r(&env_htab, (char *)default_environment, sizeof(default_environment), '\0', flags, 0, 0, NULL) == 0) - error("Environment import failed: errno = %d\n", errno); + pr_err("Environment import failed: errno = %d\n", errno); gd->flags |= GD_FLG_ENV_READY; gd->flags |= GD_FLG_ENV_DEFAULT; @@ -172,7 +172,7 @@ int env_import(const char *buf, int check) /* Decrypt the env if desired. */ ret = env_aes_cbc_crypt(ep, 0); if (ret) { - error("Failed to decrypt env!\n"); + pr_err("Failed to decrypt env!\n"); set_default_env("!import failed"); return ret; } @@ -183,7 +183,7 @@ int env_import(const char *buf, int check) return 1; } - error("Cannot import environment: errno = %d\n", errno); + pr_err("Cannot import environment: errno = %d\n", errno); set_default_env("!import failed"); @@ -247,7 +247,7 @@ int env_export(env_t *env_out) res = (char *)env_out->data; len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL); if (len < 0) { - error("Cannot export environment: errno = %d\n", errno); + pr_err("Cannot export environment: errno = %d\n", errno); return 1; } diff --git a/env/dataflash.c b/env/dataflash.c deleted file mode 100644 index 77bc595e0d..0000000000 --- a/env/dataflash.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * LowLevel function for DataFlash environment support - * Author : Gilles Gastaldi (Atmel) - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include <common.h> -#include <command.h> -#include <environment.h> -#include <linux/stddef.h> -#include <dataflash.h> -#include <search.h> -#include <errno.h> - -DECLARE_GLOBAL_DATA_PTR; - -static int env_dataflash_get_char(int index) -{ - uchar c; - - read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t, data), - 1, (char *)&c); - return c; -} - -static int env_dataflash_load(void) -{ - ulong crc, new = 0; - unsigned off; - char buf[CONFIG_ENV_SIZE]; - - /* Read old CRC */ - read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), - sizeof(ulong), (char *)&crc); - - /* Read whole environment */ - read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf); - - /* Calculate the CRC */ - off = offsetof(env_t, data); - new = crc32(new, (unsigned char *)(buf + off), ENV_SIZE); - - if (crc == new) - env_import(buf, 1); - else - set_default_env("!bad CRC"); - - return 0; -} - -#ifdef CONFIG_ENV_OFFSET_REDUND -#error No support for redundant environment on dataflash yet! -#endif - -static int env_dataflash_save(void) -{ - env_t env_new; - int ret; - - ret = env_export(&env_new); - if (ret) - return ret; - - return write_dataflash(CONFIG_ENV_ADDR, - (unsigned long)&env_new, - CONFIG_ENV_SIZE); -} - -U_BOOT_ENV_LOCATION(dataflash) = { - .location = ENVL_DATAFLASH, - ENV_NAME("dataflash") - .get_char = env_dataflash_get_char, - .load = env_dataflash_load, - .save = env_save_ptr(env_dataflash_save), -}; @@ -28,9 +28,7 @@ static struct env_driver *env_driver_lookup(enum env_location loc) static enum env_location env_get_default_location(void) { - if IS_ENABLED(CONFIG_ENV_IS_IN_DATAFLASH) - return ENVL_DATAFLASH; - else if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM) + if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM) return ENVL_EEPROM; else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) return ENVL_FAT; @@ -236,7 +236,7 @@ static int env_sf_load(void) ret = env_import((char *)ep, 0); if (!ret) { - error("Cannot import environment: errno = %d\n", errno); + pr_err("Cannot import environment: errno = %d\n", errno); set_default_env("!env_import failed"); } |