Merge 39fbccd064a41cf8ca675ada2cb6431b42253d92 into 594abed8639b4f4a7fc9b7898d85eb48acbd0072

2025-04-13 22:23:08 +00:00 · 2025-04-04 09:27:40 -04:00 · 2025-04-04 09:27:40 -04:00 · 699a27c0ed
commit 699a27c0ed
parent 594abed863 39fbccd064
11 changed files with 103 additions and 18 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -549,3 +549,32 @@ workflows:
          subcommand: ""
          requires:
            - novacustom-nv4x_adl
+
+      # coreboot fam15h
+      - build:
+          name: kgpe-d16_workstation
+          target: kgpe-d16_workstation
+          subcommand: ""
+          requires:
+            - librem_l1um
+
+      - build:
+          name: kgpe-d16_workstation-usb_keyboard
+          target: kgpe-d16_workstation-usb_keyboard
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
+
+      - build:
+          name: UNMAINTAINED_kgpe-d16_server
+          target: UNMAINTAINED_kgpe-d16_server
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
+
+      - build:
+          name: UNMAINTAINED_kgpe-d16_server-whiptail
+          target: UNMAINTAINED_kgpe-d16_server-whiptail
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
--- a/BOARD_TESTERS.md
+++ b/BOARD_TESTERS.md
@ -54,7 +54,7 @@ Clevo:

 Desktops/Servers
 ==
- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12): @arhabd @Tonux599 @zifxify https://matrix.to/#/@rsabdpy:matrix.org
+- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12: brought back in 15h fork): @arhabd @zifxify https://matrix.to/#/@rsabdpy:matrix.org
 - [ ] Librem L1UM v1 (Broadwell): @JonathonHall-Purism
 - [ ] Librem L1Um v2 (CoffeeLake): @JonathonHall-Purism
 - [ ] Talos II (PPC64LE, Power9) : @tlaurion (Will become untested, no other known users, not worth my time nor effort even though massive investment of all forms)
--- a/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config
+++ b/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config
@ -18,7 +18,7 @@
 #   sure their operating system loads microcode updates.

 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=15h
 export CONFIG_LINUX_VERSION=6.1.8

 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
--- a/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config
+++ b/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config
@ -16,7 +16,7 @@
 # - Please contribute documentation on heads-wiki
 # - Please support https://github.com/osresearch/heads/issues/719
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=15h
 export CONFIG_LINUX_VERSION=6.1.8

 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
--- a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
+++ b/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
@ -10,9 +10,14 @@
 #   in which newer Linux releases panics when the newest microcode is loaded by
 #   coreboot. AMD Opteron 6300 series users are STRONGLY encouraged to make
 #   sure their operating system loads microcode updates.
+#
+# Since Qubes OS version 4.2 you need to use a speculative execution work around to utilize qubes with pcie devices attached see https://15h.org/index.php/Qubes_OS
+# ask in the 15h.org matrix group about this if you are unsure or have trubble getting it to work
+#
+# read more about this board https://15h.org/index.php/KGPE-D16

 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=15h
 export CONFIG_LINUX_VERSION=6.1.8

 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
--- a/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
+++ b/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
@ -6,17 +6,21 @@
 # Status:
 # - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon
 # - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440
-# - Please contribute documentation on heads-wiki
+# - Please contribute documentation on heads-wiki / 15h.org
 # - Please support https://github.com/osresearch/heads/issues/719
 # - Disk Unlock Key released by TPM since not deactivated
 # - Currently, no microcode is included with coreboot. This is due to to a bug
 #   in which newer Linux releases panics when the newest microcode is loaded by
 #   coreboot. AMD Opteron 6300 series users are STRONGLY encouraged to make
 #   sure their operating system loads microcode updates.
-
+#
+# Since Qubes OS version 4.2 you need to use a speculative execution work around to utilize qubes with pcie devices attached see https://15h.org/index.php/Qubes_OS
+# ask in the 15h.org matrix group about this if you are unsure or have trubble getting it to work
+#
+# read more about this board https://15h.org/index.php/KGPE-D16

 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=15h
 export CONFIG_LINUX_VERSION=6.1.8

 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
--- a/config/coreboot-kgpe-d16_server-whiptail.config
+++ b/config/coreboot-kgpe-d16_server-whiptail.config
@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-CONFIG_MEASURED_BOOT=y

 #
 # Mainboard
@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@ -161,6 +161,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
+CONFIG_IPMI_FRU_SINGLE_RW_SZ=16
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set

 #
@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set
 # CONFIG_GIC is not set
 CONFIG_IPMI_KCS=y
+CONFIG_IPMI_KCS_TIMEOUT_MS=5000
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
-# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
@ -529,6 +532,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
@ -542,6 +546,7 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+CONFIG_VBOOT_LIB=y

 #
 # Trusted Platform Module
@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 CONFIG_TPM_RDRESP_NEED_DELAY=y
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""

 #
 # Memory initialization
 #
+# CONFIG_STM 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
@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
+# CONFIG_DEBUG_IPMI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
--- a/config/coreboot-kgpe-d16_server.config
+++ b/config/coreboot-kgpe-d16_server.config
@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-CONFIG_MEASURED_BOOT=y

 #
 # Mainboard
@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@ -161,12 +161,14 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
+CONFIG_IPMI_FRU_SINGLE_RW_SZ=16
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_HEAP_SIZE=0xc0000
+CONFIG_CPU_ADDR_BITS=48
 # CONFIG_CONSOLE_POST is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@ -209,7 +211,6 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
 # SoC
 #
 CONFIG_HAVE_BOOTBLOCK=y
-CONFIG_CPU_ADDR_BITS=48
 CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set

 #
@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set
 # CONFIG_GIC is not set
 CONFIG_IPMI_KCS=y
+CONFIG_IPMI_KCS_TIMEOUT_MS=5000
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
-# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
@ -529,6 +532,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
@ -542,6 +546,7 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+CONFIG_VBOOT_LIB=y

 #
 # Trusted Platform Module
@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 CONFIG_TPM_RDRESP_NEED_DELAY=y
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""

 #
 # Memory initialization
 #
+# CONFIG_STM 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
@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
+# CONFIG_DEBUG_IPMI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
--- a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
+++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-CONFIG_MEASURED_BOOT=y

 #
 # Mainboard
@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@ -161,12 +161,14 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
+CONFIG_IPMI_FRU_SINGLE_RW_SZ=16
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_HEAP_SIZE=0xc0000
+CONFIG_CPU_ADDR_BITS=48
 # CONFIG_CONSOLE_POST is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@ -209,7 +211,6 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
 # SoC
 #
 CONFIG_HAVE_BOOTBLOCK=y
-CONFIG_CPU_ADDR_BITS=48
 CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set

 #
@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set
 # CONFIG_GIC is not set
 CONFIG_IPMI_KCS=y
+CONFIG_IPMI_KCS_TIMEOUT_MS=5000
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
-# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
@ -529,6 +532,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
@ -542,6 +546,7 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+CONFIG_VBOOT_LIB=y

 #
 # Trusted Platform Module
@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 CONFIG_TPM_RDRESP_NEED_DELAY=y
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""

 #
 # Memory initialization
 #
+# CONFIG_STM 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
@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
+# CONFIG_DEBUG_IPMI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
--- a/config/coreboot-kgpe-d16_workstation.config
+++ b/config/coreboot-kgpe-d16_workstation.config
@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-CONFIG_MEASURED_BOOT=y

 #
 # Mainboard
@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@ -161,12 +161,14 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
+CONFIG_IPMI_FRU_SINGLE_RW_SZ=16
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_HEAP_SIZE=0xc0000
+CONFIG_CPU_ADDR_BITS=48
 # CONFIG_CONSOLE_POST is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@ -209,7 +211,6 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
 # SoC
 #
 CONFIG_HAVE_BOOTBLOCK=y
-CONFIG_CPU_ADDR_BITS=48
 CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set

 #
@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set
 # CONFIG_GIC is not set
 CONFIG_IPMI_KCS=y
+CONFIG_IPMI_KCS_TIMEOUT_MS=5000
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
-# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
@ -529,6 +532,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
@ -542,6 +546,7 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+CONFIG_VBOOT_LIB=y

 #
 # Trusted Platform Module
@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 CONFIG_TPM_RDRESP_NEED_DELAY=y
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""

 #
 # Memory initialization
 #
+# CONFIG_STM 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
@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
+# CONFIG_DEBUG_IPMI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
--- a/modules/coreboot
+++ b/modules/coreboot
@ -109,6 +109,17 @@ coreboot-24.12_commit_hash := 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a
 #Don't reuse any coreboot buildstack for now since nothing else is based on 24.12
 $(eval $(call coreboot_module,24.12,))

+# 15h fork is based on 4.11. So crossgcc buildstack could be reused for librem_l1um here once more.
+# Advantages of using 15h.org 4.11 fork includes
+#  - improved ram init
+#  - support for up to 256gb
+#  - high quality fan contol
+# Pointing to https://git.15h.org/mrothfuss/coreboot-15h/src/branch/4.11-tpm-measured-boot latest commit as of 20250316
+coreboot-15h_repo := https://git.15h.org/mrothfuss/coreboot-15h.git
+coreboot-15h_commit_hash := 1c529657c0c1221f1c63dd8cd1fd096c7821de9c
+$(eval $(call coreboot_module,15h,4.11))
+
+
 # Check that the board configured the coreboot version correctly
 ifeq "$(CONFIG_COREBOOT_VERSION)" ""
 	$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")