aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-10-06 15:46:33 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2017-10-06 18:44:18 +0200
commitec5ceae930d729e79c90022a7b63301ad7a300d7 (patch)
treedea225ab50b1e05412419959e5d8ee9cc043751f /boot
parent5e897285bfa7b06de1e63a35bcd66711a3f6b082 (diff)
downloadbuildroot-ec5ceae930d729e79c90022a7b63301ad7a300d7.tar.gz
buildroot-ec5ceae930d729e79c90022a7b63301ad7a300d7.tar.bz2
u-boot: add option to specify config fragments
U-Boot nowadays also uses kconfig, so we can handle config fragments like we do for barebox/busybox/linux. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'boot')
-rw-r--r--boot/uboot/Config.in6
-rw-r--r--boot/uboot/uboot.mk1
2 files changed, 7 insertions, 0 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 84b7fb42ee..8215912339 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -129,6 +129,12 @@ config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
depends on BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
help
Path to the U-Boot configuration file.
+
+config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES
+ string "Additional configuration fragment files"
+ help
+ A space-separated list of configuration fragment files,
+ that will be merged to the main U-Boot configuration file.
endif
config BR2_TARGET_UBOOT_NEEDS_DTC
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 14a8cc949a..fdacf16856 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -196,6 +196,7 @@ else ifeq ($(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),y)
UBOOT_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
endif # BR2_TARGET_UBOOT_USE_DEFCONFIG
+UBOOT_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES))
UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS)
define UBOOT_HELP_CMDS