mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge patch series "env: migrate static flags list to Kconfig"
This series from James Hilliard <james.hilliard1@gmail.com> converts the static flags list for the environment to be configured via Kconfig and updates the documentation. Link: https://lore.kernel.org/r/20260511182036.50453-1-james.hilliard1@gmail.com
This commit is contained in:
@@ -413,7 +413,4 @@
|
||||
|
||||
/* UBI support */
|
||||
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
|
||||
"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
|
||||
|
||||
#endif /* __ARISTAINETOS2_CONFIG_H */
|
||||
|
||||
@@ -38,19 +38,6 @@
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
AHAB_ENV
|
||||
|
||||
#ifdef CONFIG_ENV_WRITEABLE_LIST
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC \
|
||||
"bootcount:dw," \
|
||||
"bootdelay:sw," \
|
||||
"bootlimit:dw," \
|
||||
"partitionset_active:sw," \
|
||||
"rastate:dw," \
|
||||
"sig_a:sw,sig_b:sw," \
|
||||
"target_env:sw," \
|
||||
"upgrade_available:dw," \
|
||||
"ustate:dw"
|
||||
#endif
|
||||
|
||||
/* Default location for tftp and bootm */
|
||||
|
||||
/* On CCP board, USDHC1 is for eMMC */
|
||||
|
||||
@@ -8,8 +8,4 @@
|
||||
#ifndef __CONFIGS_HMIBSC_H
|
||||
#define __CONFIGS_HMIBSC_H
|
||||
|
||||
/* PHY needs a longer aneg time */
|
||||
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC "BOOT_A_LEFT:dw,BOOT_B_LEFT:dw,BOOT_ORDER:sw"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -44,18 +44,6 @@
|
||||
"then env set env_persisted 1; run save_env; fi;\0" \
|
||||
"save_env=env save; env save\0"
|
||||
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC \
|
||||
"bootset:bw," \
|
||||
"clone_pending:bw," \
|
||||
"endurance_test:bw," \
|
||||
"env_persisted:bw," \
|
||||
"factory_reset:bw," \
|
||||
"fdtcontroladdr:xw," \
|
||||
"fitpart:dw," \
|
||||
"mmcpart:dw," \
|
||||
"production:bw," \
|
||||
"ustate:dw"
|
||||
|
||||
#else
|
||||
/* SD Card boot */
|
||||
#define ENV_EXTRA \
|
||||
|
||||
@@ -38,12 +38,4 @@
|
||||
func(MMC, mmc, 0) \
|
||||
BOOT_TARGET_USB(func)
|
||||
|
||||
#ifdef CONFIG_ENV_WRITEABLE_LIST
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC \
|
||||
"board_uuid:sw,board_name:sw,board_serial:sw,board_a5e:sw," \
|
||||
"mlfb:sw,fw_version:sw,seboot_version:sw," \
|
||||
"m2_manual_config:sw," \
|
||||
"eth1addr:mw,eth2addr:mw,watchdog_timeout_ms:dw,boot_targets:sw"
|
||||
#endif
|
||||
|
||||
#endif /* __CONFIG_IOT2050_H */
|
||||
|
||||
@@ -22,21 +22,6 @@
|
||||
#define EXTRA_BOOTPARAMS
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SYS_BOOT_LOCKED
|
||||
#define EXTRA_ENV_FLAGS
|
||||
#else
|
||||
#define EXTRA_ENV_FLAGS "mmcdev:dw,"
|
||||
#endif
|
||||
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC \
|
||||
"mmcpart:dw," \
|
||||
"mmcpart_committed:dw," \
|
||||
"ustate:dw," \
|
||||
"bootcount:dw," \
|
||||
"bootlimit:dw," \
|
||||
"upgrade_available:dw," \
|
||||
EXTRA_ENV_FLAGS
|
||||
|
||||
/* Physical Memory Map */
|
||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
||||
|
||||
|
||||
@@ -108,8 +108,6 @@
|
||||
*/
|
||||
#define CFG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
|
||||
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,eth1addr:mw,system1_addr:xw,serial#:sw,ethact:sw,ethprime:sw"
|
||||
|
||||
/* pass open firmware flat tree */
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -37,10 +37,6 @@ enum env_flags_varaccess {
|
||||
#define ENV_FLAGS_VARTYPE_LOC 0
|
||||
#define ENV_FLAGS_VARACCESS_LOC 1
|
||||
|
||||
#ifndef CFG_ENV_FLAGS_LIST_STATIC
|
||||
#define CFG_ENV_FLAGS_LIST_STATIC ""
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(NET)
|
||||
#ifdef CONFIG_REGEX
|
||||
#define ETHADDR_WILDCARD "\\d*"
|
||||
@@ -89,7 +85,7 @@ enum env_flags_varaccess {
|
||||
NET_FLAGS \
|
||||
NET6_FLAGS \
|
||||
SERIAL_FLAGS \
|
||||
CFG_ENV_FLAGS_LIST_STATIC
|
||||
CONFIG_ENV_FLAGS_LIST_STATIC
|
||||
|
||||
#ifdef CONFIG_CMD_ENV_FLAGS
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user