May 2020 - U-Boot

[PATCH] armv8: cache_v8: fix mmu_set_region_dcache_behaviour
by Peng Fan 26 May '20

26 May '20

enum dcache_option already shift left 2 bits, PMD_ATTRINDX(option), will wrongly shift left the attr 4bits, which is wrong. And make the region user set not has expected attribute and might affect the splitted block region. Reviewed-by: Ye Li <ye.li(a)nxp.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- arch/arm/cpu/armv8/cache_v8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index 6a5518f9de..35ee5572e9 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -555,7 +555,7 @@ static u64 set_one_region(u64 start, u64 size, u64 attrs, bool flag, int level) void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, enum dcache_option option) { - u64 attrs = PMD_ATTRINDX(option); + u64 attrs = PMD_ATTRINDX(option >> 2); u64 real_start = start; u64 real_size = size; -- 2.16.4

2 4

[GIT PULL] TI changes for v2020.07-rc3
by Lokesh Vutla 26 May '20

26 May '20

Hi Tom, Please find the pull request for v2020.07-rc3 containing TI specific changes. Travis-CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/690912492 Thanks and regards, Lokesh The following changes since commit ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03: Merge tag 'efi-2020-07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-05-18 08:17:29 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.07-rc3 for you to fetch changes up to c02712a7484918648e5dd09c092035c7eeb7794a: arm: mach-k3: Enable dcache in SPL (2020-05-19 14:41:13 +0530) ---------------------------------------------------------------- Below are the major changes in this PR: - Enable DM_ETH on omap3_logic board - Enable Caches in SPL for K3 platforms - Enable backup boot mode support for J721E - Update the DDR timings for AM654 EVM - Add automated tests for RX-51 ---------------------------------------------------------------- Adam Ford (1): ARM: omap3_logic boards: Convert to DM_ETH Andreas Dannenberg (1): arm: mach-k3: j721e_init: Add support for backup boot modes Jan Kiszka (1): arm: mach-k3: Enable dcache in SPL Pali Rohár (1): Nokia RX-51: Add automated test for running RX-51 build in qemu Praneeth Bajjuri (1): ddr: k3-am654: EMIF Tool update to 2.02 for IO optimizations and fixes .azure-pipelines.yml | 13 + .gitlab-ci.yml | 8 + .travis.yml | 7 + arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi | 28 +-- .../arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi | 10 + .../arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi | 10 + .../dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi | 10 + .../dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi | 12 + arch/arm/mach-k3/am6_init.c | 1 + arch/arm/mach-k3/common.c | 35 +++ arch/arm/mach-k3/common.h | 1 + arch/arm/mach-k3/include/mach/j721e_hardware.h | 2 + arch/arm/mach-k3/include/mach/j721e_spl.h | 12 + arch/arm/mach-k3/j721e_init.c | 36 ++- board/logicpd/omap3som/omap3logic.c | 36 ++- board/nokia/rx51/MAINTAINERS | 1 + board/ti/am65x/evm.c | 2 + configs/omap35_logic_defconfig | 2 +- configs/omap35_logic_somlv_defconfig | 2 +- configs/omap3_logic_defconfig | 2 +- configs/omap3_logic_somlv_defconfig | 2 +- test/nokia_rx51_test.sh | 262 +++++++++++++++++++++ 22 files changed, 455 insertions(+), 39 deletions(-) create mode 100755 test/nokia_rx51_test.sh -- 2.23.0

2 1

altera intel cyclone v / error: enabling full line of zeros but not enabled in Cortex-A9
by Nico Becker 25 May '20

25 May '20

hi, i have an error message booting linux kernel v4.15 with the u-boot v2020.01 on an cylcone v with arm core. the error message is: L2C-310: enabling full line of zeros but not enabled in Cortex-A9, that is not a warning or an message it is an error. before the update to the version v2020.01, we use the version v2017.09. i get the following message: L2C-310 full line of zeros enabled for Cortex-A9, no error message. we use our own board with an altera cyclone v, i try severall default configs, i got the same error. it is very hard to find the source code to enable the full line support in u-boot. 8.2.3. Write full line of zeros Setting bit [3] of the ACTLR enables this feature. can somebody help me? thanks a lot

1 0

[PATCH 1/1] MAINTAINERS: add dfu.h and dfu.rst to DFU
by Heinrich Schuchardt 25 May '20

25 May '20

include/dfu.h and doc/api/dfu.rst belong to the device firmware update sub-system. So let's add them to DFU in MAINTAINERS. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8add9d4c2a..9fa88fc900 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -600,8 +600,10 @@ F: cmd/usb_*.c F: common/dfu.c F: common/update.c F: common/usb_storage.c +F: doc/api/dfu.rst F: drivers/dfu/ F: drivers/usb/gadget/ +F: include/dfu.h DRIVER MODEL M: Simon Glass <sjg(a)chromium.org> -- 2.26.2

3 2

[PATCH 1/1] doc: dfu: describe more DFU function
by Heinrich Schuchardt 25 May '20

25 May '20

Add some of the missing DFU function descriptions. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/dfu.h | 178 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 174 insertions(+), 4 deletions(-) diff --git a/include/dfu.h b/include/dfu.h index 938a4d1b81..065d8db824 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -159,20 +159,139 @@ struct dfu_entity { }; #ifdef CONFIG_SET_DFU_ALT_INFO +/** + * set_dfu_alt_info() - set dfu_alt_info environment variable + * + * If CONFIG_SET_DFU_ALT_INFO=y, this board specific function is called to set + * environment variable dfu_alt_info. + * + * @interface: dfu interface, e.g. "mmc" or "nand" + * @devstr: device number as string + */ void set_dfu_alt_info(char *interface, char *devstr); #endif + +/** + * dfu_alt_init() - initialize buffer for dfu entities + * + * @num: number of entities + * @dfu: on return allocated buffer + * Return: 0 on success + */ int dfu_alt_init(int num, struct dfu_entity **dfu); + +/** + * dfu_alt_add() - add alternate to dfu entity buffer + * + * @dfu: dfu entity + * @interface: dfu interface, e.g. "mmc" or "nand" + * @devstr: device number as string + * @s: string description of alternate + * Return: 0 on success + */ int dfu_alt_add(struct dfu_entity *dfu, char *interface, char *devstr, char *s); + +/** + * dfu_config_entities() - initialize dfu entitities from envirionment + * + * Initialize the list of dfu entities from environment variable dfu_alt_info. + * The list must be freed by calling dfu_free_entities(). This function bypasses + * set_dfu_alt_info(). So typically you should use dfu_init_env_entities() + * instead. + * + * See function :c:func:`dfu_free_entities` + * See function :c:func:`dfu_init_env_entities` + * + * @s: string with alternates + * @interface: interface, e.g. "mmc" or "nand" + * @devstr: device number as string + * Return: 0 on success, a negative error code otherwise + */ int dfu_config_entities(char *s, char *interface, char *devstr); + +/** + * dfu_free_entities() - free the list of dfu entities + * + * Free the internal list of dfu entities. + * + * See function :c:func:`dfu_init_env_entities` + */ void dfu_free_entities(void); + +/** + * dfu_show_entities() - print DFU alt settings list + */ void dfu_show_entities(void); + +/** + * dfu_get_alt_number() - get number of alternates + * + * Return: number of alternates in the dfu entities list + */ int dfu_get_alt_number(void); -const char *dfu_get_dev_type(enum dfu_device_type t); -const char *dfu_get_layout(enum dfu_layout l); + +/** + * dfu_get_dev_type() - get string representation for dfu device type + * + * @type: device type + * Return: string representation for device type + */ +const char *dfu_get_dev_type(enum dfu_device_type type); + +/** + * dfu_get_layout() - get string describing layout + * + * Internally layouts are represented by enum dfu_device_type values. This + * function translates an enum value to a human readable string, e.g. DFU_FS_FAT + * is translated to "FAT". + * + * @layout: layout + * Result: string representation for the layout + */ +const char *dfu_get_layout(enum dfu_layout layout); + +/** + * dfu_get_entity() - get dfu entity for an alternate id + * + * @alt: alternate id + * Return: dfu entity + */ struct dfu_entity *dfu_get_entity(int alt); + char *dfu_extract_token(char** e, int *n); + +/** + * dfu_get_alt() - get alternate id for filename + * + * Environment variable dfu_alt_info defines the write destinations (alternates) + * for different filenames. This function get the index of the alternate for + * a filename. If an absolute filename is provided (starting with '/'), the + * directory path is ignored. + * + * @name: filename + * Return: id of the alternate or negative error number (-ENODEV) + */ int dfu_get_alt(char *name); + +/** + * dfu_init_env_entities() - initialize dfu entitities from envirionment + * + * Initialize the list of dfu entities from environment variable dfu_alt_info. + * The list must be freed by calling dfu_free_entities(). + * @interface and @devstr are used to select the relevant set of alternates + * from environment variable dfu_alt_info. + * + * If environment variable dfu_alt_info specifies the interface and the device, + * use NULL for @interface and @devstr. + * + * See function :c:func:`dfu_free_entities` + * + * @interface: interface, e.g. "mmc" or "nand" + * @devstr: device number as string + * Return: 0 on success, a negative error code otherwise + */ int dfu_init_env_entities(char *interface, char *devstr); + unsigned char *dfu_get_buf(struct dfu_entity *dfu); unsigned char *dfu_free_buf(void); unsigned long dfu_get_buf_size(void); @@ -183,8 +302,59 @@ unsigned long dfu_get_timeout(void); void dfu_set_timeout(unsigned long); #endif +/** + * dfu_read() - read from dfu entity + * + * The block sequence number @blk_seq_num is a 16 bit counter that must be + * incremented with each call for the same dfu entity @de. + * + * @de: dfu entity + * @buf: buffer + * @size: size of buffer + * @blk_seq_num: block sequence number + * Return: 0 for success, -1 for error + */ int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num); + +/** + * dfu_write() - write to dfu entity + * + * Write the contents of a buffer @buf to the dfu entity @de. After writing + * the last block call dfu_flush(). If a file is already loaded completely + * into memory it is preferable to use dfu_write_from_mem_addr() which takes + * care of blockwise transfer and flushing. + * + * The block sequence number @blk_seq_num is a 16 bit counter that must be + * incremented with each call for the same dfu entity @de. + * + * See function :c:func:`dfu_flush` + * See function :c:func:`dfu_write_from_mem_addr` + * + * @de: dfu entity + * @buf: buffer + * @size: size of buffer + * @blk_seq_num: block sequence number + * Return: 0 for success, -1 for error + */ int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); + +/** + * dfu_flush() - flush to dfu entity + * + * This function has to be called after writing the last block to the dfu + * entity @de. + * + * The block sequence number @blk_seq_num is a 16 bit counter that must be + * incremented with each call for the same dfu entity @de. + * + * See function :c:func:`dfu_write` + * + * @de: dfu entity + * @buf: ignored + * @size: ignored + * @blk_seq_num: block sequence number of last write - ignored + * Return: 0 for success, -1 for error + */ int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num); /** @@ -195,9 +365,9 @@ int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num); * DFU targets. * * @dfu: pointer to the dfu_entity, which should be initialized - * */ void dfu_initiated_callback(struct dfu_entity *dfu); + /** * dfu_flush_callback() - weak callback called at the end of the DFU write * @@ -205,7 +375,6 @@ void dfu_initiated_callback(struct dfu_entity *dfu); * This function allows to manage some board specific behavior on DFU targets * * @dfu: pointer to the dfu_entity, which should be flushed - * */ void dfu_flush_callback(struct dfu_entity *dfu); @@ -217,6 +386,7 @@ void dfu_transaction_cleanup(struct dfu_entity *dfu); * It should be NULL when not used. */ extern struct dfu_entity *dfu_defer_flush; + /** * dfu_get_defer_flush() - get current value of dfu_defer_flush pointer * -- 2.26.2

3 2

[PATCH 1/1] doc: dfu: fix typos in README.dfu
by Heinrich Schuchardt 25 May '20

25 May '20

Fix some typos. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.dfu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/README.dfu b/doc/README.dfu index 29230ec654..4b9f883540 100644 --- a/doc/README.dfu +++ b/doc/README.dfu @@ -48,12 +48,12 @@ Configuration Options: CONFIG_CMD_DFU Environment variables: - the dfu command use 3 environments variables: + the dfu command uses 3 environments variables: "dfu_alt_info" : the DFU setting for the USB download gadget with a semicolon separated string of information on each alternate: dfu_alt_info="<alt1>;<alt2>;....;<altN>" - when only several device are used, the format is: + when several devices are used, the format is: - <interface> <dev>'='alternate list (';' separated) - each interface is separated by '&' dfu_alt_info=\ @@ -63,7 +63,7 @@ Environment variables: "<interfaceI> <devI>=<altY+1>;....;<altZ>&" "dfu_bufsiz" : size of the DFU buffer, when absent, use - CONFIG_SYS_DFU_DATA_BUF_SIZE (8MiB by default) + CONFIG_SYS_DFU_DATA_BUF_SIZE (8 MiB by default) "dfu_hash_algo" : name of the hash algorithm to use -- 2.26.2

4 3

[PATCH 1/1] doc: dfu: add DFU to HTML documentation
by Heinrich Schuchardt 25 May '20

25 May '20

Add the device firmware update functions to the generated HTML documentation. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/api/dfu.rst | 7 +++++++ doc/api/index.rst | 1 + include/dfu.h | 40 ++++++++++++++++++++-------------------- 3 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 doc/api/dfu.rst diff --git a/doc/api/dfu.rst b/doc/api/dfu.rst new file mode 100644 index 0000000000..5bd9e292a5 --- /dev/null +++ b/doc/api/dfu.rst @@ -0,0 +1,7 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Device firmware update +====================== + +.. kernel-doc:: include/dfu.h + :internal: diff --git a/doc/api/index.rst b/doc/api/index.rst index 2578abd40e..fd3b5bdc82 100644 --- a/doc/api/index.rst +++ b/doc/api/index.rst @@ -6,6 +6,7 @@ U-Boot API documentation .. toctree:: :maxdepth: 2 + dfu efi linker_lists serial diff --git a/include/dfu.h b/include/dfu.h index 2f0e335ec0..00e1543944 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -188,23 +188,23 @@ int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num); /** - * dfu_initiated_callback - weak callback called on DFU transaction start + * dfu_initiated_callback() - weak callback called on DFU transaction start * * It is a callback function called by DFU stack when a DFU transaction is * initiated. This function allows to manage some board specific behavior on * DFU targets. * - * @param dfu - pointer to the dfu_entity, which should be initialized + * @dfu: pointer to the dfu_entity, which should be initialized * */ void dfu_initiated_callback(struct dfu_entity *dfu); /** - * dfu_flush_callback - weak callback called at the end of the DFU write + * dfu_flush_callback() - weak callback called at the end of the DFU write * * It is a callback function called by DFU stack after DFU manifestation. * This function allows to manage some board specific behavior on DFU targets * - * @param dfu - pointer to the dfu_entity, which should be flushed + * @dfu: pointer to the dfu_entity, which should be flushed * */ void dfu_flush_callback(struct dfu_entity *dfu); @@ -218,9 +218,9 @@ void dfu_transaction_cleanup(struct dfu_entity *dfu); */ extern struct dfu_entity *dfu_defer_flush; /** - * dfu_get_defer_flush - get current value of dfu_defer_flush pointer + * dfu_get_defer_flush() - get current value of dfu_defer_flush pointer * - * @return - value of the dfu_defer_flush pointer + * Return: value of the dfu_defer_flush pointer */ static inline struct dfu_entity *dfu_get_defer_flush(void) { @@ -228,9 +228,9 @@ static inline struct dfu_entity *dfu_get_defer_flush(void) } /** - * dfu_set_defer_flush - set the dfu_defer_flush pointer + * dfu_set_defer_flush() - set the dfu_defer_flush pointer * - * @param dfu - pointer to the dfu_entity, which should be written + * @dfu: pointer to the dfu_entity, which should be written */ static inline void dfu_set_defer_flush(struct dfu_entity *dfu) { @@ -238,16 +238,16 @@ static inline void dfu_set_defer_flush(struct dfu_entity *dfu) } /** - * dfu_write_from_mem_addr - write data from memory to DFU managed medium + * dfu_write_from_mem_addr() - write data from memory to DFU managed medium * * This function adds support for writing data starting from fixed memory * address (like $loadaddr) to dfu managed medium (e.g. NAND, MMC, file system) * - * @param dfu - dfu entity to which we want to store data - * @param buf - fixed memory addres from where data starts - * @param size - number of bytes to write + * @dfu: dfu entity to which we want to store data + * @buf: fixed memory addres from where data starts + * @size: number of bytes to write * - * @return - 0 on success, other value on failure + * Return: 0 on success, other value on failure */ int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size); @@ -324,17 +324,17 @@ static inline int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, #endif /** - * dfu_tftp_write - Write TFTP data to DFU medium + * dfu_tftp_write() - write TFTP data to DFU medium * * This function is storing data received via TFTP on DFU supported medium. * - * @param dfu_entity_name - name of DFU entity to write - * @param addr - address of data buffer to write - * @param len - number of bytes - * @param interface - destination DFU medium (e.g. "mmc") - * @param devstring - instance number of destination DFU medium (e.g. "1") + * @dfu_entity_name: name of DFU entity to write + * @addr: address of data buffer to write + * @len: number of bytes + * @interface: destination DFU medium (e.g. "mmc") + * @devstring: instance number of destination DFU medium (e.g. "1") * - * @return 0 on success, otherwise error code + * Return: 0 on success, otherwise error code */ #if CONFIG_IS_ENABLED(DFU_TFTP) int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len, -- 2.26.2

3 2

[PATCH 1/1] doc: dfu: describe eMMC partition number parameter
by Heinrich Schuchardt 25 May '20

25 May '20

In dfu_alt_info for eMMC the eMMC partition number can be specified. The separator in dfu_alt_info is a semicolon not a comma. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.dfu | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/README.dfu b/doc/README.dfu index caf1c9998c..29230ec654 100644 --- a/doc/README.dfu +++ b/doc/README.dfu @@ -49,7 +49,7 @@ Configuration Options: Environment variables: the dfu command use 3 environments variables: - "dfu_alt_info" : the DFU setting for the USB download gadget with a comma + "dfu_alt_info" : the DFU setting for the USB download gadget with a semicolon separated string of information on each alternate: dfu_alt_info="<alt1>;<alt2>;....;<altN>" @@ -87,12 +87,21 @@ Commands: "mmc" (for eMMC and SD card) cmd: dfu 0 mmc <dev> each element in "dfu_alt_info" = - <name> raw <offset> <size> raw access to mmc device - <name> part <dev> <part_id> raw acces to partition - <name> fat <dev> <part_id> file in FAT partition - <name> ext4 <dev> <part_id> file in EXT4 partition + <name> raw <offset> <size> [mmcpart <num>] raw access to mmc device + <name> part <dev> <part_id> [mmcpart <num>] raw access to partition + <name> fat <dev> <part_id> [mmcpart <num>] file in FAT partition + <name> ext4 <dev> <part_id> [mmcpart <num>] file in EXT4 partition + + with <partid> being the GPT or DOS partition index, + with <num> being the eMMC hardware partition number. + + A value of environment variable dfu_alt_info for eMMC could be: + + "u-boot raw 0x3e 0x800 mmcpart 1;bl2 raw 0x1e 0x1d mmcpart 1" + + A value of environment variable dfu_alt_info for SD card could be: - with <partid> is the GPT or DOS partition index + "u-boot raw 0x80 0x800;uImage ext4 0 2" "nand" (raw slc nand device) cmd: dfu 0 nand <dev> -- 2.26.2

3 2

[PATCH 0/4] cmd: {zip, unzip} fixes
by Michael Walle 25 May '20

25 May '20

Automatically pull in the needed libraries for zip and unzip. Move the CONFIG_GZIP_COMPRESSED from legacy config.h style to a Kconfig option. The sole user of CONFIG_GZIP_COMPRESSED is the sandbox target for the compression tests. Remove the CONFIG option in its config.h and instead select it together with CONFIG_SANDBOX. Michael Walle (4): cmd: unzip: automatically select CONFIG_GZIP cmd: zip: automatically pull in gzip() cmd: zip: fix implicit declaration warning sandbox: move compression option to Kconfig arch/Kconfig | 2 ++ cmd/Kconfig | 2 ++ cmd/zip.c | 1 + include/configs/sandbox.h | 3 --- lib/Kconfig | 4 ++++ scripts/config_whitelist.txt | 2 -- 6 files changed, 9 insertions(+), 5 deletions(-) -- 2.20.1

4 12

[PATCH] env: Convert ENV_ACCESS_IGNORE_FORCE to Kconfig
by Marek Vasut 25 May '20

25 May '20

Convert ENV_ACCESS_IGNORE_FORCE to Kconfig, no functional change. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- README | 4 ---- env/Kconfig | 7 +++++++ scripts/config_whitelist.txt | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README b/README index be9e6391d6..17dc0ee33b 100644 --- a/README +++ b/README @@ -2729,10 +2729,6 @@ Configuration Settings: regular expression. This allows multiple variables to define the same flags without explicitly listing them for each variable. -- CONFIG_ENV_ACCESS_IGNORE_FORCE - If defined, don't allow the -f switch to env set override variable - access flags. - The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: diff --git a/env/Kconfig b/env/Kconfig index ed94e83ec1..ca7fef682b 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -604,6 +604,13 @@ config DELAY_ENVIRONMENT later by U-Boot code. With CONFIG_OF_CONTROL this is instead controlled by the value of /config/load-environment. +config ENV_ACCESS_IGNORE_FORCE + bool "Block forced environment operations" + default n + help + If defined, don't allow the -f switch to env set override variable + access flags. + if SPL_ENV_SUPPORT config SPL_ENV_IS_NOWHERE bool "SPL Environment is not stored" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3f5e6504e1..0b3fb728a0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -415,7 +415,6 @@ CONFIG_ENABLE_36BIT_PHYS CONFIG_ENABLE_MMU CONFIG_ENABLE_MUST_CHECK CONFIG_ENABLE_WARN_DEPRECATED -CONFIG_ENV_ACCESS_IGNORE_FORCE CONFIG_ENV_ADDR_FLEX CONFIG_ENV_CALLBACK_LIST_DEFAULT CONFIG_ENV_CALLBACK_LIST_STATIC -- 2.25.1

2 1