aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
commitcddaae8229f69aba753bcb6603f2f1e395e4f8dd (patch)
tree32d8ef5448083d487c4358ba035af797927038f3 /docs
parent841d3ac7e04fe3c2d8f4ccbc063db5650ec4779e (diff)
parent9b6a122841664ec8bea2b84e585adb3528909227 (diff)
downloadbuildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.tar.gz
buildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/adding-packages-kconfig.txt15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index e87d393070..17f91e3f2d 100644
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -34,8 +34,14 @@ This snippet creates the following make targets:
* +foo-menuconfig+, which calls the package's +menuconfig+ target
-* +foo-update-config+, which copies the configuration back to the source
- configuration file.
+* +foo-update-config+, which copies the configuration back to the
+ source configuration file. It is not possible to use this target
+ when fragment files are set.
+
+* +foo-update-defconfig+, which copies the configuration back to the
+ source configuration file. The configuration file will only list the
+ options that differ from the default values. It is not possible to
+ use this target when fragment files are set.
and ensures that the source configuration file is copied to the build
directory at the right moment.
@@ -46,6 +52,11 @@ be set to suit the needs of the package under consideration:
* +FOO_KCONFIG_EDITORS+: a space-separated list of kconfig editors to
support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
+* +FOO_KCONFIG_FRAGMENT_FILES+: a space-separated list of configuration
+ fragment files that are merged to the main configuration file.
+ Fragment files are typically used when there is a desire to stay in sync
+ with an upstream (def)config file, with some minor modifications.
+
* +FOO_KCONFIG_OPTS+: extra options to pass when calling the kconfig
editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
default, empty.