aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-04-02 18:18:57 -0400
committerTom Rini <trini@konsulko.com>2022-04-02 18:18:57 -0400
commit25b8acee2ea11a9edc100c42a61f5d6187eb6167 (patch)
tree9ef7799b64b242ee0531e3c5af0f522778dc89e0 /doc
parent10d615f2fcc0d2ef1d611844eb6032fe0fca8afd (diff)
downloadu-boot-25b8acee2ea11a9edc100c42a61f5d6187eb6167.zip
u-boot-25b8acee2ea11a9edc100c42a61f5d6187eb6167.tar.gz
u-boot-25b8acee2ea11a9edc100c42a61f5d6187eb6167.tar.bz2
Revert "global: Remove CONFIG_SYS_EXTRA_OPTIONS support"WIP/02Apr2022-next
Unfortunately, we require additional logic to buildman to support this removal and still use SYS_SOC, etc, for build targets. This reverts commit eeec00072d7a0b5b91896d014618e558ce438738. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/README.kconfig7
-rw-r--r--doc/develop/moveconfig.rst3
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/README.kconfig b/doc/README.kconfig
index 808cf56..0689f66 100644
--- a/doc/README.kconfig
+++ b/doc/README.kconfig
@@ -99,6 +99,7 @@ Kconfig. Each field of boards.cfg was converted as follows:
Vendor -> CONFIG_SYS_VENDOR defined by Kconfig
Board -> CONFIG_SYS_BOARD defined by Kconfig
Target -> File name of defconfig (configs/<target>_defconfig)
+ Options -> CONFIG_SYS_EXTRA_OPTIONS defined by Kconfig
Maintainers -> "M:" entry of MAINTAINERS
@@ -139,6 +140,12 @@ When removing an obsolete board, the following steps are generally needed:
TODO
----
+- The option field of boards.cfg, which was used for the pre-Kconfig
+ configuration, moved to CONFIG_SYS_EXTRA_OPTIONS verbatim now.
+ Board maintainers are expected to implement proper Kconfig options
+ and switch over to them. Eventually CONFIG_SYS_EXTRA_OPTIONS will go away.
+ CONFIG_SYS_EXTRA_OPTIONS should not be used for new boards.
+
- In the pre-Kconfig, a single board had multiple entries in the boards.cfg
file with differences in the option fields. The corresponding defconfig
files were auto-generated when switching to Kconfig. Now we have too many
diff --git a/doc/develop/moveconfig.rst b/doc/develop/moveconfig.rst
index bfb7aff..2f53ea5 100644
--- a/doc/develop/moveconfig.rst
+++ b/doc/develop/moveconfig.rst
@@ -295,7 +295,8 @@ Available options
-y, --yes
Instead of prompting, automatically go ahead with all operations. This
- includes cleaning up headers, the config whitelist and the README.
+ includes cleaning up headers, CONFIG_SYS_EXTRA_OPTIONS, the config whitelist
+ and the README.
To see the complete list of supported options, run::