summaryrefslogtreecommitdiffstats
path: root/boot/barebox/Config.in
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
commitcddaae8229f69aba753bcb6603f2f1e395e4f8dd (patch)
tree32d8ef5448083d487c4358ba035af797927038f3 /boot/barebox/Config.in
parent841d3ac7e04fe3c2d8f4ccbc063db5650ec4779e (diff)
parent9b6a122841664ec8bea2b84e585adb3528909227 (diff)
downloadbuildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.tar.gz
buildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot/barebox/Config.in')
-rw-r--r--boot/barebox/Config.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index a250f3b344..53d80139b4 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -91,6 +91,12 @@ config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
help
Path to the barebox configuration file
+config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES
+ string "Additional configuration fragment files"
+ help
+ A space-separated list of configuration fragment files,
+ that will be merged to the main Barebox configuration file.
+
config BR2_TARGET_BAREBOX_BAREBOXENV
bool "bareboxenv tool in target"
help
OpenPOWER on IntegriCloud