From af43d0aa34ad515d60f7176f47f5268795c715eb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 Apr 2020 14:10:23 +0200 Subject: [PATCH] package/intel-micro-code: bear the kernel options munging Signed-off-by: Yann E. MORIN Cc: Maxime Hadjinlian Cc: Carlos Santos Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 3 --- package/intel-microcode/intel-microcode.mk | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index e0a69444eb..25443c608e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -355,9 +355,6 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV), $(call KCONFIG_ENABLE_OPT,CONFIG_NET)) - $(if $(BR2_PACKAGE_INTEL_MICROCODE), - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL)) $(if $(BR2_PACKAGE_KTAP), $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS) diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 0492ace69e..f3d05d5f58 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -27,4 +27,9 @@ else INTEL_MICROCODE_INSTALL_TARGET = NO endif +define INTEL_MICROCODE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +endef + $(eval $(generic-package))