From 7241aee4ed7d85659a0eb0f369d8a3a44ffc176e Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 28 Apr 2015 16:34:35 +0200 Subject: [PATCH] barebox: add option to specify config fragments Signed-off-by: Floris Bos Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- boot/barebox/Config.in | 6 ++++++ boot/barebox/barebox.mk | 1 + 2 files changed, 7 insertions(+) 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 diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 294acbd4b5..7e530371c3 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -64,6 +64,7 @@ BAREBOX_SOURCE_CONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)) endif BAREBOX_KCONFIG_FILE = $(BAREBOX_SOURCE_CONFIG) +BAREBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES)) BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig BAREBOX_KCONFIG_OPTS = $(BAREBOX_MAKE_FLAGS) -- 2.30.2