From: John Crispin <john@phrozen.org>
Date: Tue, 27 Nov 2018 17:58:37 +0000 (+0100)
Subject: Revert "intel-microcode: create early load microcode image"
X-Git-Tag: v19.07.0-rc1~2071
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=231d9d5327d161aed166949ea9328609927674ff;p=openwrt%2Fstaging%2Fpepe2k.git

Revert "intel-microcode: create early load microcode image"

This reverts commit 022ffb56b2491fd7d8051ac6e6c7622ecc313d8f.

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile
index 4bd47b087a..07db9b1f96 100644
--- a/package/firmware/intel-microcode/Makefile
+++ b/package/firmware/intel-microcode/Makefile
@@ -35,17 +35,15 @@ define Package/intel-microcode
 endef
 
 define Build/Compile
-	IUCODE_TOOL=$(STAGING_DIR)/../host/bin/iucode_tool \
-		$(MAKE) -C $(PKG_BUILD_DIR)
-	$(STAGING_DIR)/../host/bin/iucode_tool -q --mini-earlyfw \
-		--write-earlyfw=$(PKG_BUILD_DIR)/intel-ucode.cpio \
-		$(PKG_BUILD_DIR)/$(MICROCODE).bin
+	IUCODE_TOOL=$(STAGING_DIR)/../host/bin/iucode_tool $(MAKE) -C $(PKG_BUILD_DIR)
+	mkdir $(PKG_BUILD_DIR)/intel-ucode-ipkg
+	$(STAGING_DIR)/../host/bin/iucode_tool -q \
+		--write-firmware=$(PKG_BUILD_DIR)/intel-ucode-ipkg $(PKG_BUILD_DIR)/$(MICROCODE).bin
 endef
 
 define Package/intel-microcode/install
-	$(INSTALL_DIR) $(1)/boot
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel-ucode.cpio \
-		$(1)/boot/intel-ucode.img
+	$(INSTALL_DIR) $(1)/lib/firmware/intel-ucode
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel-ucode-ipkg/* $(1)/lib/firmware/intel-ucode
 endef
 
 $(eval $(call BuildPackage,intel-microcode))