Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert CONFIG_ENV_MIN_ENTRIES et al to Kconfig

Browse source 
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>
This commit is contained in:
Tom Rini 2022-06-12 20:01:58 -04:00
parent 910feb50d4
commit 82e0b51ccb
8 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README
View file

@ -1877,14 +1877,6 @@ Configuration Settings:
while unprotecting/erasing/programming. Please only enable while unprotecting/erasing/programming. Please only enable
this option if you really know what you are doing. 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_DEFAULT
- CONFIG_ENV_FLAGS_LIST_STATIC - CONFIG_ENV_FLAGS_LIST_STATIC
Enable validation of the values given to environment variables when Enable validation of the values given to environment variables when

1
configs/clearfog_defconfig
View file

@ -50,6 +50,7 @@ CONFIG_CMD_TIME=y
CONFIG_CMD_MVEBU_BUBT=y CONFIG_CMD_MVEBU_BUBT=y
# CONFIG_SPL_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_MIN_ENTRIES=128
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y

1
configs/helios4_defconfig
View file

@ -51,6 +51,7 @@ CONFIG_CMD_TIME=y
CONFIG_CMD_MVEBU_BUBT=y CONFIG_CMD_MVEBU_BUBT=y
# CONFIG_SPL_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_MIN_ENTRIES=128
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y

16
env/Kconfig vendored
View file

@ -30,6 +30,22 @@ config ENV_OVERWRITE
Use this to permit overriding of certain environmental variables Use this to permit overriding of certain environmental variables
like Ethernet and Serial 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 config ENV_IS_NOWHERE
bool "Environment is not stored" bool "Environment is not stored"
default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \ default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \

2
include/configs/clearfog.h
View file

@ -18,8 +18,6 @@
* U-Boot into it. * U-Boot into it.
*/ */
#define CONFIG_ENV_MIN_ENTRIES 128
/* Environment in MMC */ /* Environment in MMC */
/* /*
* For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC

2
include/configs/helios4.h
View file

@ -18,8 +18,6 @@
* U-Boot into it. * U-Boot into it.
*/ */
#define CONFIG_ENV_MIN_ENTRIES 128
/* Environment in MMC */ /* Environment in MMC */
/* /*
* For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC

5
include/configs/xilinx_zynqmp.h
View file

@ -207,11 +207,6 @@
/* ATF is my kernel image */ /* 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 #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE
# error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used" # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
#endif #endif

7
lib/hashtable.c
View file

@ -35,13 +35,6 @@
# include <linux/ctype.h> # include <linux/ctype.h>
#endif #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_FREE 0
#define USED_DELETED -1 #define USED_DELETED -1