env: Drop DELAY_ENVIRONMENT
There are no users of DELAY_ENVIRONMENT and the same effect can be achieved either using DT /config/load-environment property, or by using ENV_IS_NOWHERE . Remove this configuration option and matching functionality. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
@@ -950,15 +950,6 @@ The following options need to be configured:
|
||||
the environment like the "source" command or the
|
||||
boot command first.
|
||||
|
||||
CONFIG_DELAY_ENVIRONMENT
|
||||
|
||||
Normally the environment is loaded when the board is
|
||||
initialised so that it is available to U-Boot. This inhibits
|
||||
that so that the environment is not available until
|
||||
explicitly loaded later by U-Boot code. With CONFIG_OF_CONTROL
|
||||
this is instead controlled by the value of
|
||||
/config/load-environment.
|
||||
|
||||
- Automatic software updates via TFTP server
|
||||
CONFIG_UPDATE_TFTP
|
||||
CONFIG_UPDATE_TFTP_CNT_MAX
|
||||
|
||||
@@ -442,9 +442,6 @@ static int should_load_env(void)
|
||||
if (IS_ENABLED(CONFIG_OF_CONTROL))
|
||||
return ofnode_conf_read_int("load-environment", 1);
|
||||
|
||||
if (IS_ENABLED(CONFIG_DELAY_ENVIRONMENT))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Vendored
-12
@@ -774,18 +774,6 @@ config ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||
run-time determined information about the hardware to the
|
||||
environment. These will be named board_name, board_rev.
|
||||
|
||||
config DELAY_ENVIRONMENT
|
||||
bool "Delay environment loading"
|
||||
depends on !OF_CONTROL
|
||||
help
|
||||
Enable this to inhibit loading the environment during board
|
||||
initialization. This can address the security risk of untrusted data
|
||||
being used during boot. Normally the environment is loaded when the
|
||||
board is initialised so that it is available to U-Boot. This inhibits
|
||||
that so that the environment is not available until explicitly loaded
|
||||
later by U-Boot code. With CONFIG_OF_CONTROL this is instead
|
||||
controlled by the value of /config/load-environment.
|
||||
|
||||
config ENV_IMPORT_FDT
|
||||
bool "Amend environment by FDT properties"
|
||||
depends on OF_CONTROL
|
||||
|
||||
Reference in New Issue
Block a user