fix amd mainboard configs

in a build test, canoeboot 0.1 builds, but master doesn't,
and neither does lbmk. i changed a few of them when doing
the crossgcc build optimisation patches.

i'm just copying the configs from there. unlike in the
canoeboot version of this patch, i've re-enabled microcode
updates in these lbmk configs.

Signed-off-by: Leah Rowe <leah@libreboot.org>

12 files changed, 32 insertions, 23 deletions

diff --git a/config/coreboot/fam15h_rdimm/target.cfg b/config/coreboot/fam15h_rdimm/target.cfg
index 9b99ec9e..7ca0c217 100644
--- a/config/coreboot/fam15h_rdimm/target.cfg
+++ b/config/coreboot/fam15h_rdimm/target.cfg
@@ -1,7 +1,2 @@
 tree="fam15h_rdimm"
 rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-payload_grub="n"
-payload_grub_withseabios="n"
-payload_seabios="n"
-payload_memtest="n"
-xlang="c"
diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg
index 06aa17af..06c40595 100644
--- a/config/coreboot/fam15h_udimm/target.cfg
+++ b/config/coreboot/fam15h_udimm/target.cfg
@@ -1,9 +1,3 @@
 tree="fam15h_udimm"
 tree_depend="fam15h_rdimm"
-xtree="fam15h_rdimm"
 rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-payload_grub="n"
-payload_grub_withseabios="n"
-payload_seabios="n"
-payload_memtest="n"
-xlang="c"
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
index a501619d..e5c58008 100644
--- a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
index fc3074e3..19da9a2c 100644
--- a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
index a501619d..e5c58008 100644
--- a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
index fc3074e3..19da9a2c 100644
--- a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode b/config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
index 04ad7691..32d61412 100644
--- a/config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
@@ -97,10 +98,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -427,6 +430,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode b/config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
index 47e292e3..6c7cc560 100644
--- a/config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
@@ -97,10 +98,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -427,6 +430,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
index 088360b1..765025d2 100644
--- a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
index 575501b3..c203474a 100644
--- a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
index 088360b1..765025d2 100644
--- a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
index 575501b3..c203474a 100644
--- a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
@@ -21,7 +21,8 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
-# CONFIG_USE_BLOBS is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 CONFIG_NO_RELOCATABLE_RAMSTAGE=y