Update coreboot (again)

Also improve the deblob utilities

6 files changed, 93 insertions, 34 deletions

diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 2d98acfd..46db4fdd 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -106,7 +106,6 @@ CONFIG_VENDOR_APPLE=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="apple/macbook21"
 CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
-CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="Apple"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,27a2"
@@ -117,7 +116,6 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 # CONFIG_BOARD_APPLE_MACBOOK11 is not set
 CONFIG_BOARD_APPLE_MACBOOK21=y
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
@@ -125,12 +123,18 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
+# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
+# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
+# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
 CONFIG_POST_DEVICE=y
 CONFIG_SEABIOS_PS2_TIMEOUT=0
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -152,13 +156,13 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -187,6 +191,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -242,7 +250,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -282,6 +289,7 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
@@ -291,6 +299,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -405,7 +415,6 @@ CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
-CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_PER_DEVICE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 
@@ -413,7 +422,7 @@ CONFIG_COMMON_FADT=y
 # System tables
 #
 CONFIG_GENERATE_MP_TABLE=y
-CONFIG_GENERATE_PIRQ_TABLE=y
+# CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
@@ -428,6 +437,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
@@ -441,7 +452,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_DEBUG_PIRQ is not set
 # CONFIG_HAVE_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index cb4c92dd..5a3b6415 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -106,7 +106,6 @@ CONFIG_VENDOR_LENOVO=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t60"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60"
-CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,27a2"
@@ -117,12 +116,18 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
+# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
+# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
+# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -135,8 +140,8 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 CONFIG_BOARD_LENOVO_T60=y
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +163,13 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -193,6 +198,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -248,7 +257,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -295,6 +303,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
@@ -304,6 +313,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -419,7 +430,6 @@ CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
-CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_PER_DEVICE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 
@@ -427,7 +437,7 @@ CONFIG_COMMON_FADT=y
 # System tables
 #
 CONFIG_GENERATE_MP_TABLE=y
-CONFIG_GENERATE_PIRQ_TABLE=y
+# CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG"
@@ -442,6 +452,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
@@ -455,7 +467,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_DEBUG_PIRQ is not set
 # CONFIG_HAVE_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index a58ca2fe..c6bea271 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -106,7 +106,6 @@ CONFIG_VENDOR_LENOVO=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
-CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
@@ -117,12 +116,14 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -135,8 +136,8 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=0
-CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +159,13 @@ CONFIG_ROM_SIZE=0x400000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -193,6 +194,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -245,7 +250,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -283,6 +287,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index ca1363de..85528c2a 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -106,7 +106,6 @@ CONFIG_VENDOR_LENOVO=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
-CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
@@ -117,12 +116,18 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
+# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
+# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
+# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -135,8 +140,8 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=0
-CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +163,13 @@ CONFIG_ROM_SIZE=0x800000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -193,6 +198,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -245,7 +254,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -283,6 +291,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
@@ -292,6 +301,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -429,6 +440,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 9ff95c44..1a3b023c 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -117,12 +117,18 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
+# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
+# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
+# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -135,8 +141,8 @@ CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +164,13 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -193,6 +199,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -248,7 +258,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -295,6 +304,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
@@ -304,6 +314,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -445,6 +457,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index 14ad5bea..2251bbb6 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -117,12 +117,14 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -135,8 +137,8 @@ CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +160,13 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
-CONFIG_STACK_SIZE=0x1000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 CONFIG_PC80_SYSTEM=y
@@ -193,6 +195,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -248,7 +254,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_VIDEO_MB=0
-CONFIG_RAMTOP=0x200000
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
@@ -295,6 +300,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices