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

Mon Dec 16 17:48:44 CET 2013

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 d60911dbe03d1dfe6bc615ef9dfba9cca91288f5
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 fdf08aa..03314f0 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -76,10 +76,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 09e731c..f2600c5 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -76,10 +76,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 6691ce3..0ef621d 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -64,10 +64,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 4ea8aca..2e21e9a 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -65,10 +65,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 3c2fc52..006c3dd 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -64,10 +64,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 d8a3191..ce1ad46 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -63,10 +63,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 c2ed696..9500906 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -64,10 +64,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 6816d58..8ba1456 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -66,10 +66,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 942a81d..d8f9b45 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -74,10 +74,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 99b9c67..2b67f97 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -76,10 +76,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 8ff88b2..8817cf4 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -64,10 +64,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 15032f6..0a15ef9 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -64,10 +64,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 20be00f..5ca9023 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -64,10 +64,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 7250017..92bd808 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -68,10 +68,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 4c02a62..ee5ad20 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -64,10 +64,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 11dd1e5..65e27cd 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -64,10 +64,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 b6baac3..2237e0f 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -141,10 +141,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-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 94b56ea..021791c 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -85,10 +85,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 89675d3..bcbd2ac 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -84,10 +84,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 5e28aea..53abdd8 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -64,10 +64,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 085148f..d78ca45 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -77,10 +77,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config RAMBASE
 	hex
 	default 0x200000

