[Buildroot] [git commit] package/intel-micro-code: bear the kernel options munging

Thomas Petazzoni thomas.petazzoni at bootlin.com
Fri May 1 13:50:28 UTC 2020


commit: https://git.buildroot.net/buildroot/commit/?id=af43d0aa34ad515d60f7176f47f5268795c715eb
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Cc: Maxime Hadjinlian <maxime.hadjinlian at gmail.com>
Cc: Carlos Santos <unixmania at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 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))


More information about the buildroot mailing list