diff options
| author | Tom Rini <[email protected]> | 2025-06-20 12:54:41 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-20 12:57:47 -0600 |
| commit | dbf7fd557a73ded3141db3c2cf5c572989378825 (patch) | |
| tree | 3ddc26559c485e357e1d0a72d8ec2551250831cf /doc | |
| parent | 73fd2456231fe12db3bd5dbdab3f9f62bd8e643d (diff) | |
| parent | 224224c9fa287bed428d5c507b8926357191848a (diff) | |
Merge patch series "Consistent Kconfig environment options CONFIG_ENV_ prefix"
Marek Vasut <[email protected]> says:
Rename the environment related variables and add ENV_ prefix, so that
all configuration options which are related to environment would have
an CONFIG_ENV_ prefix. No functional change.
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/device-tree-bindings/config.txt | 4 | ||||
| -rw-r--r-- | doc/usage/environment.rst | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/device-tree-bindings/config.txt b/doc/device-tree-bindings/config.txt index f50c68bbdc3..fffb69e75de 100644 --- a/doc/device-tree-bindings/config.txt +++ b/doc/device-tree-bindings/config.txt @@ -70,13 +70,13 @@ u-boot,mmc-env-offset-redundant (int) u-boot,mmc-env-partition (int) if present, the environment shall be placed at the last CONFIG_ENV_SIZE blocks of the partition on the - CONFIG_SYS_MMC_ENV_DEV. + CONFIG_ENV_MMC_DEVICE_INDEX. if u-boot,mmc-env-offset* is present, this setting will take precedence. In that case, only if the partition is not found, mmc-env-offset* will be tried. - Note that CONFIG_ENV_MMC_PARTITION overrides this device-tree setting. + Note that CONFIG_ENV_MMC_SW_PARTITION overrides this device-tree setting. u-boot,no-apm-finalize (bool) For x86 devices running on coreboot, this tells U-Boot not to lock 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`. |