Convert CONFIG_ENV_MIN_ENTRIES et al to Kconfig

This converts the following to Kconfig:
   CONFIG_ENV_MIN_ENTRIES
   CONFIG_ENV_MAX_ENTRIES

Cc: Michal Simek <michal.simek@amd.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 1362a96b0f6b2f595503309792645c6a2e70895c..dbb0d9695496d366f8372a11dc2cc1f8c3f78033 100644 (file)
--- a/README
+++ b/README
@@ -1877,14 +1877,6 @@ Configuration Settings:
                while unprotecting/erasing/programming. Please only enable
                this option if you really know what you are doing.
 
-- CONFIG_ENV_MAX_ENTRIES
-
-       Maximum number of entries in the hash table that is used
-       internally to store the environment settings. The default
-       setting is supposed to be generous and should work in most
-       cases. This setting can be used to tune behaviour; see
-       lib/hashtable.c for details.
-
 - CONFIG_ENV_FLAGS_LIST_DEFAULT
 - CONFIG_ENV_FLAGS_LIST_STATIC
        Enable validation of the values given to environment variables when

diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index bec36beb8554d652d08c98968caec256e9c7cc6c..1ee0c6637573e26ffd58d7598873d7b852075f30 100644 (file)
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -50,6 +50,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_MVEBU_BUBT=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_MIN_ENTRIES=128
 CONFIG_ARP_TIMEOUT=200
 CONFIG_NET_RETRY_COUNT=50
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 2a1db65d1bfd66e90fd06461d179aae10cead2f8..4642eb1ccb2505f2a90308f5faed0b3fa9cc91f4 100644 (file)
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -51,6 +51,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_MVEBU_BUBT=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_MIN_ENTRIES=128
 CONFIG_ARP_TIMEOUT=200
 CONFIG_NET_RETRY_COUNT=50
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/env/Kconfig b/env/Kconfig
index 2f625b22575a1e4ec3f582031c63e0c598ac142a..0aed7aea46bcb28e0b9c4c9833f7e05894507f45 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -30,6 +30,22 @@ config ENV_OVERWRITE
          Use this to permit overriding of certain environmental variables
          like Ethernet and Serial
 
+config ENV_MIN_ENTRIES
+       int "Minimum number of entries in the environment hashtable"
+       default 64
+       help
+         Minimum number of entries in the hash table that is used internally
+         to store the environment settings.
+
+config ENV_MAX_ENTRIES
+       int "Maximumm number of entries in the environment hashtable"
+       default 512
+       help
+         Maximum number of entries in the hash table that is used internally
+         to store the environment settings. The default setting is supposed to
+         be generous and should work in most cases. This setting can be used
+         to tune behaviour; see lib/hashtable.c for details.
+
 config ENV_IS_NOWHERE
        bool "Environment is not stored"
        default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index af04352eda3b8a2cd5f8534ba7ea7d997ed0a576..9969269bf2ac23b5a00ee9072f4f320c5cb35144 100644 (file)
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -18,8 +18,6 @@
  * U-Boot into it.
  */
 
-#define CONFIG_ENV_MIN_ENTRIES         128
-
 /* Environment in MMC */
 /*
  * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index cae20073584c849e69cd153964146b3c62ea43c4..ff2c50644326b52c222324b5a4b7951358a7debb 100644 (file)
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -18,8 +18,6 @@
  * U-Boot into it.
  */
 
-#define CONFIG_ENV_MIN_ENTRIES         128
-
 /* Environment in MMC */
 /*
  * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 20515b4e26ac973839a7c9248efaa0ac976f68f2..4e71a42cd34625f5bea3fa677b10755cc7b12207 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -207,11 +207,6 @@
 
 /* ATF is my kernel image */
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
-# define CONFIG_SPL_HASH
-# define CONFIG_ENV_MAX_ENTRIES        10
-#endif
-
 #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE
 # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
 #endif

diff --git a/lib/hashtable.c b/lib/hashtable.c
index ff5ff7263949f532d7792deb70677df7ab3f65a7..90c8465611e9b7de752ea9432bab90e4cb2175a9 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -35,13 +35,6 @@
 # include <linux/ctype.h>
 #endif
 
-#ifndef        CONFIG_ENV_MIN_ENTRIES  /* minimum number of entries */
-#define        CONFIG_ENV_MIN_ENTRIES 64
-#endif
-#ifndef        CONFIG_ENV_MAX_ENTRIES  /* maximum number of entries */
-#define        CONFIG_ENV_MAX_ENTRIES 512
-#endif
-
 #define USED_FREE 0
 #define USED_DELETED -1