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

Sat Jan 31 16:03:21 CET 2015

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 8acdc8ffea75a51de5aea5f14b0a103041d3086a
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/kfsn4-dre/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 ----
 23 files changed, 7 insertions(+), 89 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 ef7faf4..ab77898 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -69,10 +69,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config VGA_BIOS_ID
         string
         default "1002,9712"
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index 52f45e4..1af8d64 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -69,8 +69,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif #BOARD_AMD_BIMINI_FAM10
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 8250580..acf88ef 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -57,10 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9615"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 8677fc9..74f3c3b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -58,8 +58,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 4f5b8d5..b6c9448 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -57,10 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config VGA_BIOS
         bool
         default n
diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig b/src/mainboard/asus/kfsn4-dre/Kconfig
index 245fecf..4c0e432 100644
--- a/src/mainboard/asus/kfsn4-dre/Kconfig
+++ b/src/mainboard/asus/kfsn4-dre/Kconfig
@@ -72,10 +72,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 13
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config CK804_PCI_E_X
 	int
 	default 1
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index 440b7f5..6118d12 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -56,8 +56,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 18
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index 5162e16..dd58db3 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 19
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index 3e3fcea..19d8fd2 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -59,8 +59,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 19
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 endif
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index a76dd52..3a0f70f 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -67,10 +67,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000bf.h"
-
 config VGA_BIOS_ID
         string
         default "1002,9715"
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index 30fbe25..091dcee 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -69,10 +69,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 config VGA_BIOS_ID
         string
         default "1002,9712"
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig
index 82b5c4f..f830e81 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif # BOARD_GIGABYTE_MA785GM
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 7ae9ef8..505d033 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif # BOARD_GIGABYTE_MA785GMT
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index cd4fadf..b36640f 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 endif # BOARD_GIGABYTE_MA78GM
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index 5bb58db..f6aea01 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -64,10 +64,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 15
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config BOOTBLOCK_MAINBOARD_INIT
 	string
 	default "mainboard/hp/dl165_g6_fam10/bootblock.c"
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 7565043..069a4ae 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -57,10 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000086.h"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9615"
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index c779eca..56ad128 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000b6.h"
-
 endif # BOARD_JETWAY_PA78VM5
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 91ddbbc..f7d99f8 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -89,10 +89,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x00
 
-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 9f31542..3a72049 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -64,8 +64,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 endif # BOARD_SUPERMICRO_H8DMR_FAM10
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 89798aa..b3a1faf 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -62,8 +62,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_0100009f.h"
-
 endif # BOARD_SUPERMICRO_H8QME_FAM10
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index e76ecec..7fbbf66 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -57,8 +57,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_010000c4.h"
-
 endif # BOARD_AMD_H8SCM_FAM10
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 901a7ed..91a6e0d 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -68,10 +68,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config AMD_UCODE_PATCH_FILE
-	string
-	default "mc_patch_01000095.h"
-
 config MCP55_PCI_E_X_0
 	int
 	default 1

