From fd44aeffb21ace3c249a2b71f49d75626fe4f5ec Mon Sep 17 00:00:00 2001
From: Anton Arapov <anton@redhat.com>
Date: Aug 14 2013 17:06:36 +0000
Subject: Split-up for Fedora


Revert "Remove AMD CPU microcode. Moved to linux-firmware."

This reverts commit 57a9bb3fa3e24d6d82339e784d41eff1cb7e4c2b.

Conflicts:
	Changelog
	Makefile

---

diff --git a/Changelog b/Changelog
index a27d2d3..ba986ed 100644
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,6 @@
 2.1-1 14 August 2013, Anton Arapov <anton@redhat.com>
       Intel CPU microcode update. 20130808
 
-2.1   27 July 2013, Anton Arapov <anton@redhat.com>
-      Remove AMD CPU microcode. Moved to linux-firmware.
-
 2.0-3 03 April 2013, Anton Arapov <anton@redhat.com>
       Intel CPU microcode update. 20130222
 
diff --git a/Makefile b/Makefile
index 68db587..e753425 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@
 
 PROGRAM         = intel-microcode2ucode
 MICROCODE_INTEL = microcode-20130808.tgz
+MICROCODE_AMD   = amd-ucode-2012-09-10.tar
 
 INS             = install
 CC              = gcc
@@ -20,6 +21,7 @@ PREFIX          = /usr/local
 INSDIR          = $(PREFIX)/sbin
 DOCDIR          = $(PREFIX)/share/doc/microcode_ctl
 MICDIR          = /lib/firmware
+MICDIRAMD       = $(MICDIR)/amd-ucode
 MICDIRINTEL     = $(MICDIR)/intel-ucode
 
 all: microcode_ctl
@@ -27,19 +29,26 @@ all: microcode_ctl
 microcode_ctl: intel-microcode2ucode.c
 	$(CC) $(CFLAGS) -o $(PROGRAM) intel-microcode2ucode.c
 	tar -xOf $(MICROCODE_INTEL) | ./intel-microcode2ucode - >/dev/null
+	mkdir amd-ucode && tar --strip-components 1 -xf $(MICROCODE_AMD) -C amd-ucode
 
 clean:
-	rm -rf $(PROGRAM) intel-ucode
+	rm -rf $(PROGRAM) intel-ucode amd-ucode
 
 install:
 	$(INS) -d $(DESTDIR)$(INSDIR) $(DESTDIR)$(DOCDIR) \
-		$(DESTDIR)$(MICDIRINTEL)
+		$(DESTDIR)$(MICDIRAMD) $(DESTDIR)$(MICDIRINTEL)
 	$(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR)
 	$(INS) -m 644 README $(DESTDIR)$(DOCDIR)
 	$(INS) -m 644 intel-ucode/* $(DESTDIR)$(MICDIRINTEL)
+	$(INS) -m 644 amd-ucode/*.bin $(DESTDIR)$(MICDIRAMD)
+	$(INS) -m 644 amd-ucode/*.bin.README $(DESTDIR)$(DOCDIR)
+	$(INS) -m 644 amd-ucode/LICENSE $(DESTDIR)$(DOCDIR)/LICENSE.microcode_amd
+	$(INS) -m 644 amd-ucode/README $(DESTDIR)$(DOCDIR)/README.microcode_amd
+	$(INS) -m 644 amd-ucode/INSTALL $(DESTDIR)$(DOCDIR)/INSTALL.microcode_amd
 
 uninstall:
 	rm -rf $(DESTDIR)$(INSDIR)/$(PROGRAM) \
 		$(DESTDIR)$(MICDIRINTEL) \
+		$(DESTDIR)$(MICDIRAMD) \
 		$(DESTDIR)$(DOCDIR)
 
diff --git a/amd-ucode-2012-09-10.tar b/amd-ucode-2012-09-10.tar
new file mode 100644
index 0000000..f30f845
Binary files /dev/null and b/amd-ucode-2012-09-10.tar differ