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>

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 90f76bbc20afb4dd01e1d7483d0254c0308f33f0..4e79d03856fec3117e6614c8b544c5022531562a 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -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
 

diff --git a/env/Kconfig b/env/Kconfig
index 20516a5ff3937d6edc65539927885a512f2447ff..02cb7cbb751dbc6d0a61439bac02bb297d9d67af 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -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

diff --git a/env/Makefile b/env/Makefile
index 8df5b9d4c9063b893270f0ce47f62de372a74d25..7ce8231d9a70eaa585eb36e8bcf1ab91376cea36 100644 (file)
--- 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/dataflash.c b/env/dataflash.c
deleted file mode 100644 (file)
index 77bc595..0000000
--- 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),
-};

diff --git a/env/env.c b/env/env.c
index 43290d0832125f7ad98f78ec5df8db51b8689207..76a5608628fc3c1b9c1be12bcffb5b6843a5f3dd 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -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;

diff --git a/include/environment.h b/include/environment.h
index 03b41e0c51160d295b17f4764abfb4cb6dff312e..7b9821638960777669802c38175b0e38f78630d7 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -198,7 +198,6 @@ enum env_valid {
 };
 
 enum env_location {
-       ENVL_DATAFLASH,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,

diff --git a/tools/Makefile b/tools/Makefile
index c16477459d23c7a669feec5669e7cb986eae2d93..5db2a542252a8a695fb75077fdb7a76270f8ec8c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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