switch to 15h.org fork for kgpe-d16 and kcma-d8

aka "Mike's coreboot"

libreboot recently improved its multi-tree design to
allow specifying git repository links per-tree instead
of just per-project. this means i can now use the 15h
fork quite easily, on fam15h boards. this fork uses
AMD's AGESA source code instead of raptor engineering's
code. the modified AGESA code is compatible with a lot
more memory modules, and can support higher amounts of
memory. it's generally more reliable.

the only submodule they changed was the blobs one,
but the only commits they add are things i don't
need. they add commits that violate copyright, e.g.
distributing AST2500 VGA ROM without permission.
thus, i do not use their blobs repo. i use the
upstream coreboot one, which has what we need.

since i don't use the VGA ROM in libreboot, it's
fine. therefore, the submodule config is currently
the same as the old 4.11 tree.

they were missing two of my build fixes. they have
added some of their own as well.

note that there are two boards for kgpe-d16 and d8
here: the raptor one, and the agesa one. we are using
the agesa one.

kfnsn4-dre still uses the old tree.

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

2 files changed, 97 insertions, 111 deletions

diff --git a/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode b/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
index 7949bcfd..1eb1b679 100644
--- a/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
@@ -25,8 +25,8 @@ 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
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
+# CONFIG_NO_RELOCATABLE_RAMSTAGE is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
@@ -93,11 +93,7 @@ CONFIG_MAX_CPUS=16
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_MAINBOARD_VENDOR="ASUS"
-CONFIG_APIC_ID_OFFSET=0x0
-CONFIG_HW_MEM_HOLE_SIZEK=0x100000
-CONFIG_MAX_PHYSICAL_CPUS=2
-CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
-CONFIG_HT_CHAIN_UNITID_BASE=0x0
+CONFIG_HW_MEM_HOLE_SIZEK=0x200000
 CONFIG_IRQ_SLOT_COUNT=13
 CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
@@ -110,6 +106,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_BOARD_ASUS_AM1I_A is not set
+# CONFIG_BOARD_ASUS_CROSSHAIR_V_FORMULA_Z is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
@@ -138,20 +135,19 @@ CONFIG_BOARD_ASUS_KCMA_D8=y
 # CONFIG_BOARD_ASUS_P8H61_M_LX is not set
 # CONFIG_BOARD_ASUS_P8H61_M_PRO is not set
 # CONFIG_BOARD_ASUS_P8Z77_M_PRO is not set
+# CONFIG_BOARD_ASUS_RAPTOR_KCMA_D8 is not set
+# CONFIG_BOARD_ASUS_RAPTOR_KGPE_D16 is not set
+# CONFIG_BOARD_ASUS_SABERTOOTH_990FX_R2 is not set
+CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_POST_IO=y
-CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kcma-d8/bootblock.c"
-CONFIG_DCACHE_RAM_BASE=0xc2000
-CONFIG_DCACHE_RAM_SIZE=0x1e000
-CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
-CONFIG_MAX_REBOOT_CNT=10
+CONFIG_DCACHE_RAM_BASE=0x30000
+CONFIG_DCACHE_RAM_SIZE=0x10000
+CONFIG_MAX_REBOOT_CNT=3
 CONFIG_OVERRIDE_DEVICETREE=""
-CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 # CONFIG_VBOOT is not set
-CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
+CONFIG_MMCONF_BASE_ADDRESS=0xF8000000
 CONFIG_POST_DEVICE=y
-CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
-CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_DIMM_MAX=4
@@ -187,7 +183,6 @@ CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
-CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
 # CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set
 CONFIG_POWER_STATE_ON_AFTER_FAILURE=y
 # CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
@@ -207,9 +202,9 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
 #
 CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=48
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_MMCONF_BUS_NUMBER=64
+# CONFIG_S3_VGA_ROM_RUN is not set
 CONFIG_EHCI_BAR=0xfef00000
-CONFIG_SMM_MODULE_STACK_SIZE=0x400
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
@@ -223,7 +218,7 @@ CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_TTYS0_BASE=0x3f8
-CONFIG_HPET_MIN_TICKS=0x14
+CONFIG_HPET_MIN_TICKS=0x37EE
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
@@ -244,102 +239,99 @@ CONFIG_UART_PCI_ADDR=0x0
 #
 # CPU
 #
-CONFIG_CPU_SOCKET_TYPE=0x14
-# CONFIG_EXT_RT_TBL_SUPPORT is not set
 CONFIG_CBB=0x0
 CONFIG_CDB=0x18
 CONFIG_XIP_ROM_SIZE=0x80000
-CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA=y
-CONFIG_CPU_AMD_MODEL_10XXX=y
-CONFIG_USE_LARGE_DCACHE=y
-CONFIG_NUM_IPI_STARTS=1
-CONFIG_DCACHE_BSP_TOP_STACK_SIZE=0x4000
-CONFIG_DCACHE_BSP_TOP_STACK_SLUSH=0x4000
-CONFIG_DCACHE_AP_STACK_SIZE=0x500
-CONFIG_SET_FIDVID=y
-CONFIG_LIFT_BSP_APIC_ID=y
-CONFIG_SET_FIDVID_DEBUG=y
-CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
-# CONFIG_SET_FIDVID_CORE0_ONLY is not set
-CONFIG_SET_FIDVID_CORE_RANGE=0
+CONFIG_NUM_IPI_STARTS=2
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
-# CONFIG_CPU_AMD_AGESA is not set
+CONFIG_CPU_AMD_AGESA=y
+CONFIG_AGESA_LEGACY=y
+CONFIG_AGESA_LEGACY_WRAPPER=y
+# CONFIG_AGESA_NO_LEGACY is not set
+# CONFIG_ENABLE_MRC_CACHE is not set
+CONFIG_S3_DATA_POS=0xFFFF0000
+CONFIG_S3_DATA_SIZE=32768
+CONFIG_CPU_AMD_AGESA_FAMILY15=y
+# CONFIG_CPU_AMD_SOCKET_G34 is not set
+CONFIG_CPU_AMD_SOCKET_C32=y
+# CONFIG_CPU_AMD_SOCKET_AM3R2 is not set
+# CONFIG_ENABLE_AGESA_DEBUGGER is not set
+# CONFIG_REMOVE_MICROCODE is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-CONFIG_SSE2=y
+# CONFIG_SSE2 is not set
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
-CONFIG_PARALLEL_CPU_INIT=y
+# CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 CONFIG_UDELAY_LAPIC=y
-# CONFIG_LAPIC_MONOTONIC_TIMER is not set
+CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
+CONFIG_UNKNOWN_TSC_RATE=y
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
-# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
+CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_HAVE_SMI_HANDLER is not set
 # CONFIG_NO_SMM is not set
-# CONFIG_SMM_ASEG is not set
-CONFIG_SMM_TSEG=y
-CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
-CONFIG_SMM_STUB_STACK_SIZE=0x400
+CONFIG_SMM_ASEG=y
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_X86_AMD_INIT_SIPI is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
-CONFIG_CAR_GLOBAL_MIGRATION=y
+# CONFIG_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
-CONFIG_SSE=y
-CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
+# CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
-CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
-CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
-# CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
 #
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-CONFIG_NORTHBRIDGE_AMD_AMDFAM10=y
-CONFIG_AGP_APERTURE_SIZE=0x4000000
-CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
-CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY=y
-# CONFIG_HT_CHAIN_DISTRIBUTE is not set
-# CONFIG_DIMM_DDR2 is not set
-CONFIG_DIMM_DDR3=y
-CONFIG_DIMM_REGISTERED=y
-CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
-# CONFIG_SVI_HIGH_FREQ is not set
-
-#
-# HyperTransport setup
-#
-# CONFIG_LIMIT_HT_DOWN_WIDTH_8 is not set
-CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
-# CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
-CONFIG_LIMIT_HT_UP_WIDTH_16=y
+CONFIG_NORTHBRIDGE_AMD_AGESA=y
+# CONFIG_CONSOLE_VGA_MULTI is not set
+CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15=y
+# CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC is not set
+CONFIG_AMD_NB_CIMX=y
+CONFIG_NORTHBRIDGE_AMD_CIMX_RD890=y
+# CONFIG_ENABLE_NB_CIMX_DEBUGGER is not set
+CONFIG_NORTHBRIDGE_AMD_CIMX_RD890_IOMMU=y
+# CONFIG_RD890_PCIE_ASPM_DISABLED is not set
+# CONFIG_RD890_PCIE_ASPM_L0S is not set
+CONFIG_RD890_PCIE_ASPM_L1=y
+# CONFIG_RD890_PCIE_ASPM_L0S_AND_L1 is not set
+# CONFIG_RD890_PCIE_ASPM_L0S_DOWNSTREAM is not set
+# CONFIG_RD890_PCIE_ASPM_L0S_DOWNSTREAM_AND_L1 is not set
+CONFIG_RD890_PCIE_ASPM_MODE=0x02
+# CONFIG_RD890_PCIE_TX_DRIVE_STRENGTH_20MA is not set
+CONFIG_RD890_PCIE_TX_DRIVE_STRENGTH_22MA=y
+# CONFIG_RD890_PCIE_TX_DRIVE_STRENGTH_24MA is not set
+# CONFIG_RD890_PCIE_TX_DRIVE_STRENGTH_26MA is not set
+CONFIG_RD890_PCIE_TX_DRIVE_STRENGTH=0x02
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 
 #
 # Southbridge
 #
-CONFIG_SOUTHBRIDGE_SPECIFIC_OPTIONS=y
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
-# CONFIG_AMD_SB_CIMX is not set
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/cimx/sb700/bootblock.c"
+CONFIG_AMD_SB_CIMX=y
+CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700=y
+# CONFIG_ENABLE_SB_CIMX_DEBUGGER is not set
+# CONFIG_SB700_SATA_NATIVE_IDE is not set
+# CONFIG_SB700_SATA_RAID is not set
+CONFIG_SB700_SATA_AHCI=y
+# CONFIG_SB700_SATA_LEGACY_IDE is not set
+# CONFIG_SB700_SATA_IDE_TO_AHCI is not set
+# CONFIG_SB700_SATA_AHCI_AMD is not set
+# CONFIG_SB700_SATA_IDE_TO_AHCI_AMD is not set
+CONFIG_SB700_SATA_MODE=0x02
+CONFIG_SB700_SATA_HIDE_UNUSED_PORTS=y
+# CONFIG_PCIB_ENABLE is not set
+CONFIG_ACPI_SCI_IRQ=0x9
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-CONFIG_SOUTHBRIDGE_AMD_SB700=y
-CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100=y
-# CONFIG_SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT is not set
-CONFIG_SOUTHBRIDGE_AMD_SB700_DISABLE_ISA_DMA=y
-CONFIG_SOUTHBRIDGE_AMD_SR5650=y
-CONFIG_EXT_CONF_SUPPORT=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE is not set
@@ -367,6 +359,13 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # Embedded Controllers
 #
 # CONFIG_EC_GOOGLE_WILCO is not set
+
+#
+# AMD Platform Initialization
+#
+# CONFIG_CPU_AMD_AGESA_BINARY_PI is not set
+CONFIG_CPU_AMD_AGESA_OPENSOURCE=y
+# CONFIG_AGESA_EXTRA_TIMESTAMPS is not set
 # CONFIG_CAVIUM_BDK is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
@@ -391,15 +390,13 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
-# CONFIG_CBMEM_TOP_BACKUP is not set
+CONFIG_CBMEM_TOP_BACKUP=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+# CONFIG_HAVE_CMOS_DEFAULT is not set
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_HPET_ADDRESS_OVERRIDE is not set
-CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
@@ -411,6 +408,8 @@ CONFIG_ACPI_HAVE_PCAT_8259=y
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
 # CONFIG_IDT_IN_EVERY_STAGE is not set
+CONFIG_HAVE_CF9_RESET=y
+CONFIG_HAVE_CF9_RESET_PREPARE=y
 # CONFIG_PIRQ_ROUTE is not set
 
 #
@@ -427,7 +426,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # Display
 #
 CONFIG_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_SMBUS_HAS_AUX_CHANNELS=y
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
 # CONFIG_NO_MMCONF_SUPPORT is not set
 CONFIG_MMCONF_SUPPORT=y
@@ -454,22 +453,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SMMSTORE_IN_CBFS is not set
-CONFIG_SPI_FLASH=y
+# CONFIG_SPI_FLASH is not set
 # CONFIG_SPI_SDCARD is not set
-CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_NO_FAST_READ is not set
-CONFIG_SPI_FLASH_ADESTO=y
-CONFIG_SPI_FLASH_AMIC=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
@@ -486,7 +471,7 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_WIFI is not set
-# CONFIG_DRIVERS_AMD_PI is not set
+CONFIG_DRIVERS_AMD_PI=y
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
@@ -528,6 +513,7 @@ CONFIG_VGA=y
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
@@ -550,7 +536,8 @@ CONFIG_USER_NO_TPM=y
 #
 # Memory initialization
 #
-# CONFIG_STM is not set
+CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
+# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -603,14 +590,15 @@ CONFIG_POST_DEVICE_NONE=y
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
-CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK=y
-CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK=y
-CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK=y
+# CONFIG_HAVE_ACPI_RESUME is not set
+# CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
+# CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
+# CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
 # CONFIG_NO_MONOTONIC_TIMER is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_PCI_IO_CFG_EXT=y
+# CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
@@ -651,6 +639,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 # Secondary Payloads
 #
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 # CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
 # CONFIG_TINT_SECONDARY_PAYLOAD is not set
@@ -662,8 +651,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 # CPU Debug Settings
 #
-CONFIG_HAVE_DEBUG_CAR=y
-# CONFIG_DEBUG_CAR is not set
 
 #
 # BLOB Debug Settings
@@ -682,12 +669,11 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
-# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_HAVE_EM100_SUPPORT is not set
-CONFIG_ENABLE_APIC_EXT_ID=y
+# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
diff --git a/config/module/coreboot/kcma_d8_2mb/target.cfg b/config/module/coreboot/kcma_d8_2mb/target.cfg
index 6733c4d9..0a6977f0 100644
--- a/config/module/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/module/coreboot/kcma_d8_2mb/target.cfg
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="fam15h_cb411"
+tree="fam15h_15h"
 xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"