[coreboot-gerrit] Patch set updated for coreboot: 5fa4f5d amd/model_10xxx: Drop AMD_UCODE_PATCH_FILE selection

Mon Feb 24 07:34:22 CET 2014

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4521

-gerrit

commit 5fa4f5d2a6cb6eee1f6d5d517f6acc40accb8b05
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Dec 11 13:03:04 2013 +0200

    amd/model_10xxx: Drop AMD_UCODE_PATCH_FILE selection
    
    Include microcode updates in CBFS for every CPU revision the platform
    can support, as changing to different CPU revision should not require
    a coreboot rebuild.
    
    This increases CBFS usage from 2 kB to 14 kB.
    
    Change-Id: I6bf90221a688f1a54e49641ce3ba378c5bf659f9
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/amd/model_10xxx/microcode_blob.c          | 8 +++++++-
 src/mainboard/advansus/a785e-i/Kconfig            | 4 ----
 src/mainboard/amd/bimini_fam10/Kconfig            | 4 ----
 src/mainboard/amd/mahogany_fam10/Kconfig          | 4 ----
 src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 4 ----
 src/mainboard/amd/tilapia_fam10/Kconfig           | 4 ----
 src/mainboard/asus/m4a78-em/Kconfig               | 4 ----
 src/mainboard/asus/m4a785-m/Kconfig               | 4 ----
 src/mainboard/asus/m4a785t-m/Kconfig              | 4 ----
 src/mainboard/asus/m5a88-v/Kconfig                | 4 ----
 src/mainboard/avalue/eax-785e/Kconfig             | 4 ----
 src/mainboard/gigabyte/ma785gm/Kconfig            | 4 ----
 src/mainboard/gigabyte/ma785gmt/Kconfig           | 4 ----
 src/mainboard/gigabyte/ma78gm/Kconfig             | 4 ----
 src/mainboard/hp/dl165_g6_fam10/Kconfig           | 4 ----
 src/mainboard/iei/kino-780am2-fam10/Kconfig       | 4 ----
 src/mainboard/jetway/pa78vm5/Kconfig              | 4 ----
 src/mainboard/msi/ms9652_fam10/Kconfig            | 4 ----
 src/mainboard/supermicro/h8dmr_fam10/Kconfig      | 4 ----
 src/mainboard/supermicro/h8qme_fam10/Kconfig      | 4 ----
 src/mainboard/supermicro/h8scm_fam10/Kconfig      | 4 ----
 src/mainboard/tyan/s2912_fam10/Kconfig            | 4 ----
 22 files changed, 7 insertions(+), 85 deletions(-)

diff --git a/src/cpu/amd/model_10xxx/microcode_blob.c b/src/cpu/amd/model_10xxx/microcode_blob.c
index c697cea..6544a2a 100644
--- a/src/cpu/amd/model_10xxx/microcode_blob.c
+++ b/src/cpu/amd/model_10xxx/microcode_blob.c
@@ -18,7 +18,13 @@
  */
 
 unsigned char microcode[] __attribute__ ((aligned(16))) = {
-#include CONFIG_AMD_UCODE_PATCH_FILE
+#include "mc_patch_01000086.h"
+#include "mc_patch_01000095.h"
+#include "mc_patch_01000096.h"
+#include "mc_patch_0100009f.h"
+#include "mc_patch_010000b6.h"
+#include "mc_patch_010000bf.h"
+#include "mc_patch_010000c4.h"
 
 	/*  Dummy terminator  */
         0x0, 0x0, 0x0, 0x0,
diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 32500d6..7bfcaf2 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -71,10 +71,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index a04c131..da868ca 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -71,10 +71,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 2bc6a1d..d577ffd 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 37cbfa4..93a23ee 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -60,10 +60,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMTOP
 	hex
 	default 0x1000000
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 111ac29..90d2541 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index 197b3a0..c523af7 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -58,10 +58,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 18
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index f6ba242..9f9f391 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 19
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index af4fb7c..73f9cf4 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -61,10 +61,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 19
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 7ff25d4..456a98b 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -69,10 +69,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000bf.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index abfaaec..ae6a42a 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -71,10 +71,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig
index 7582320..8a6b489 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 0ea4eb7..43c1c77 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index d663eca..079e42f 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index b72b8dd..5b3075a 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -67,10 +67,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 15
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMBASE
 	hex
 	default 0x200000
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 62c8671..6164769 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000086.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index 01c4a59..14d9d61 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 8d1473d..1ec3932 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -116,10 +116,6 @@ config RAMTOP
 	hex
 	default 0x1000000
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000096.h"
-
 config HT3_SUPPORT
 	bool
 	default y
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 2f48b32..c256d79 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -80,10 +80,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 config SERIAL_CPU_INIT
 	bool
 	default n
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 27172ff..6007bfb 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -79,10 +79,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 config SERIAL_CPU_INIT
 	bool
 	default y
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 87cfc73..448cec5 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -59,10 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000c4.h"
-
 config RAMTOP
 	hex
 	default 0x2000000
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index a7f9954..c4369b0 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -72,10 +72,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMBASE
 	hex
 	default 0x200000

