diff options
| author | Tom Rini <[email protected]> | 2022-12-23 22:19:39 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-23 22:19:39 -0500 |
| commit | 3e4cbe184a0f6537abb457d6afa61224396c4e46 (patch) | |
| tree | d6e95e03385c33f5d99775cc44710fc6f540b094 /doc/develop | |
| parent | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (diff) | |
| parent | 90c7888c9d6b3223c32f068668f3bc5a81010f8e (diff) | |
Merge branch '2022-12-23-complete-phase1-CONFIG-migration' into next
- Bring in the final series to complete the main portion of migrating
CONFIG symbols to either Kconfig or CFG namespace (or removing /
renaming entirely). With this, we have stricter CI tests as well now.
Diffstat (limited to 'doc/develop')
| -rw-r--r-- | doc/develop/devicetree/control.rst | 2 | ||||
| -rw-r--r-- | doc/develop/distro.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index c71570d64b4..0b3b32be1bb 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands. To use this, put something like this in your board header file:: - #define CONFIG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" + #define CFG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" Build: diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst index bc72aa951ef..8016acad098 100644 --- a/doc/develop/distro.rst +++ b/doc/develop/distro.rst @@ -214,7 +214,7 @@ Required Environment Variables The U-Boot "syslinux" and "pxe boot" commands require a number of environment variables be set. Default values for these variables are often hard-coded into -CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that +CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that the user doesn't have to configure them. fdt_addr: |