diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | board/qualcomm/qcom-phone.config | 2 | ||||
| -rw-r--r-- | boot/Kconfig | 6 | ||||
| -rw-r--r-- | configs/qcom_defconfig | 4 | ||||
| -rw-r--r-- | configs/qcom_ipq9574_mmc_defconfig | 4 | ||||
| -rw-r--r-- | doc/usage/environment.rst | 4 | ||||
| -rw-r--r-- | env/Kconfig | 6 | ||||
| -rw-r--r-- | include/env_default.h | 4 |
8 files changed, 17 insertions, 17 deletions
@@ -1973,7 +1973,7 @@ ifeq ($(wildcard $(LDSCRIPT)),) @/bin/false endif -ifeq ($(CONFIG_USE_DEFAULT_ENV_FILE),y) +ifeq ($(CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE),y) prepare1: $(defaultenv_h) envtools: $(defaultenv_h) @@ -2053,7 +2053,7 @@ $(timestamp_h): $(srctree)/Makefile FORCE $(dt_h): $(srctree)/Makefile FORCE $(call filechk,dt.h) -$(defaultenv_h): $(CONFIG_DEFAULT_ENV_FILE:"%"=%) FORCE +$(defaultenv_h): $(CONFIG_ENV_DEFAULT_ENV_TEXT_FILE:"%"=%) FORCE $(call filechk,defaultenv.h) # --------------------------------------------------------------------------- diff --git a/board/qualcomm/qcom-phone.config b/board/qualcomm/qcom-phone.config index 913c91757c1..d24094eefdd 100644 --- a/board/qualcomm/qcom-phone.config +++ b/board/qualcomm/qcom-phone.config @@ -1,5 +1,5 @@ # Settings for phones -CONFIG_DEFAULT_ENV_FILE="board/qualcomm/qcom-phone.env" +CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/qcom-phone.env" # Hang on panic so the error message can be read CONFIG_PANIC_HANG=y # We use pause in various places to allow text to be read diff --git a/boot/Kconfig b/boot/Kconfig index 30eb5b328d7..01349e9096b 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1845,7 +1845,7 @@ config USE_BOOTARGS config BOOTARGS string "Boot arguments" - depends on USE_BOOTARGS && !USE_DEFAULT_ENV_FILE + depends on USE_BOOTARGS && !ENV_USE_DEFAULT_ENV_TEXT_FILE help This can be used to pass arguments to the bootm command. The value of CONFIG_BOOTARGS goes into the environment value "bootargs". Note that @@ -1880,7 +1880,7 @@ config USE_BOOTCOMMAND config BOOTCOMMAND string "bootcmd value" - depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE + depends on USE_BOOTCOMMAND && !ENV_USE_DEFAULT_ENV_TEXT_FILE default "bootflow scan -lb" if BOOTSTD_DEFAULTS && CMD_BOOTFLOW_FULL default "bootflow scan" if BOOTSTD_DEFAULTS && !CMD_BOOTFLOW_FULL default "run distro_bootcmd" if !BOOTSTD_BOOTCOMMAND && DISTRO_DEFAULTS @@ -1903,7 +1903,7 @@ config USE_PREBOOT config PREBOOT string "preboot default value" - depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE + depends on USE_PREBOOT && !ENV_USE_DEFAULT_ENV_TEXT_FILE default "usb start" if USB_KEYBOARD default "" help diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig index b8399701da0..5eb027ba27b 100644 --- a/configs/qcom_defconfig +++ b/configs/qcom_defconfig @@ -42,8 +42,8 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_LOG=y CONFIG_OF_LIVE=y CONFIG_OF_UPSTREAM_BUILD_VENDOR=y -CONFIG_USE_DEFAULT_ENV_FILE=y -CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env" +CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y +CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/default.env" CONFIG_BUTTON_QCOM_PMIC=y CONFIG_CLK=y CONFIG_CLK_STUB=y diff --git a/configs/qcom_ipq9574_mmc_defconfig b/configs/qcom_ipq9574_mmc_defconfig index 8d7d3d92c73..c7ce4f5c237 100644 --- a/configs/qcom_ipq9574_mmc_defconfig +++ b/configs/qcom_ipq9574_mmc_defconfig @@ -28,8 +28,8 @@ CONFIG_CMD_PART=y CONFIG_EFI_PARTITION=y CONFIG_OF_LIVE=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_USE_DEFAULT_ENV_FILE=y -CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env" +CONFIG_USE_ENV_DEFAULT_ENV_TEXT_FILE=y +CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/default.env" CONFIG_CLK=y CONFIG_CLK_QCOM_IPQ9574=y CONFIG_MSM_GPIO=y diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 7e2f2863d06..bb6c351b441 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -562,8 +562,8 @@ only effect after the next boot (yes, that's just like Windows). External environment file ------------------------- -The `CONFIG_USE_DEFAULT_ENV_FILE` option provides a way to bypass the -environment generation in U-Boot. If enabled, then `CONFIG_DEFAULT_ENV_FILE` +The `CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE` option provides a way to bypass the +environment generation in U-Boot. If enabled, then `CONFIG_ENV_DEFAULT_ENV_TEXT_FILE` provides the name of a file which is converted into the environment, completely bypassing the standard environment variables in `env_default.h`. diff --git a/env/Kconfig b/env/Kconfig index 52f5cb86584..65ab8b6392d 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -749,7 +749,7 @@ config SCSI_ENV_PART_UUID help UUID of the SCSI partition that you want to store the environment in. -config USE_DEFAULT_ENV_FILE +config ENV_USE_DEFAULT_ENV_TEXT_FILE bool "Create default environment from file" help Normally, the default environment is automatically generated @@ -758,9 +758,9 @@ config USE_DEFAULT_ENV_FILE you can instead define the entire default environment in an external file. -config DEFAULT_ENV_FILE +config ENV_DEFAULT_ENV_TEXT_FILE string "Path to default environment file" - depends on USE_DEFAULT_ENV_FILE + depends on ENV_USE_DEFAULT_ENV_TEXT_FILE help The path containing the default environment. The format is the same as accepted by the mkenvimage tool: lines diff --git a/include/env_default.h b/include/env_default.h index 6e8f2ea90e7..9caf22cdd1d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -27,7 +27,7 @@ char default_environment[] = { #else const char default_environment[] = { #endif -#ifndef CONFIG_USE_DEFAULT_ENV_FILE +#ifndef CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE #ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0" #endif @@ -136,7 +136,7 @@ const char default_environment[] = { "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" #endif "\0" -#else /* CONFIG_USE_DEFAULT_ENV_FILE */ +#else /* CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE */ #include "generated/defaultenv_autogenerated.h" #endif #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED |