From 87bd1e3724d6ffbe868a6c38fdb2b56ae20cabbd Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 28 Apr 2015 16:34:32 +0200 Subject: [PATCH] linux: add option to specify config fragments Signed-off-by: Floris Bos Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Gergely Imreh Signed-off-by: Thomas Petazzoni --- linux/Config.in | 6 ++++++ linux/linux.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index f2d46522d3..30e38e45d7 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -164,6 +164,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE Note: this can be a defconfig file or a complete .config file, which can later be saved back with make linux-update-(def)config. +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES + string "Additional configuration fragment files" + help + A space-separated list of kernel configuration fragment files, + that will be merged to the main kernel configuration file. + # # Binary format # diff --git a/linux/linux.mk b/linux/linux.mk index c765954073..eca1450d58 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -182,6 +182,7 @@ KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) endif LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) +LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) -- 2.30.2