mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-24 12:44:23 +08:00
env: Drop CONFIG_ENV_IS_IN_DATAFLASH
Last user of this option went away in commit:
fdc7718999 ("board: usb_a9263: Update to support DT and DM")
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
This commit is contained in:
Tuomas Tynkkynen
Tom Rini
parent
c005f7edbb
commit
7b7341d7f3
@ -42,7 +42,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#if !defined(CONFIG_ENV_IS_IN_EEPROM) && \
|
||||
!defined(CONFIG_ENV_IS_IN_FLASH) && \
|
||||
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
|
||||
!defined(CONFIG_ENV_IS_IN_MMC) && \
|
||||
!defined(CONFIG_ENV_IS_IN_FAT) && \
|
||||
!defined(CONFIG_ENV_IS_IN_EXT4) && \
|
||||
@ -54,7 +53,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
!defined(CONFIG_ENV_IS_IN_REMOTE) && \
|
||||
!defined(CONFIG_ENV_IS_IN_UBI) && \
|
||||
!defined(CONFIG_ENV_IS_NOWHERE)
|
||||
# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|MMC|FAT|EXT4|\
|
||||
# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|\
|
||||
NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
|
||||
15
env/Kconfig
vendored
15
env/Kconfig
vendored
@ -39,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
|
||||
|
||||
1
env/Makefile
vendored
1
env/Makefile
vendored
@ -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
|
||||
|
||||
75
env/dataflash.c
vendored
75
env/dataflash.c
vendored
@ -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),
|
||||
};
|
||||
4
env/env.c
vendored
4
env/env.c
vendored
@ -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;
|
||||
|
||||
@ -198,7 +198,6 @@ enum env_valid {
|
||||
};
|
||||
|
||||
enum env_location {
|
||||
ENVL_DATAFLASH,
|
||||
ENVL_EEPROM,
|
||||
ENVL_EXT4,
|
||||
ENVL_FAT,
|
||||
|
||||
@ -21,7 +21,6 @@ subdir-$(HOST_TOOLS_ALL) += gdb
|
||||
|
||||
# Merge all the different vars for envcrc into one
|
||||
ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
|
||||
ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
|
||||
ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
|
||||
ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
|
||||
ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
|
||||
|
||||
Loading…
Reference in New Issue
Block a user