2 files changed, 40 insertions, 8 deletions
diff --git a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb b/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
index f2e45f3f..d86cf4db 100644
--- a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
@@ -170,6 +170,7 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/supermicro_x11_lga1151_series/ifd"
 CONFIG_ME_BIN_PATH="../../../vendorfiles/supermicro_x11_lga1151_series/me.bin"
 CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 CONFIG_USE_LEGACY_8254_TIMER=y
@@ -269,7 +270,6 @@ CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
 CONFIG_MAX_HECI_DEVICES=5
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
@@ -387,6 +387,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
 
 #
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
 # Intel SoC Common PCH Code
 #
 CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -427,6 +435,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_HAVE_SMI_HANDLER=y
 CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
 CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
 CONFIG_AP_STACK_SIZE=0x800
 CONFIG_SMP=y
@@ -448,6 +457,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_PCIEXP_HOTPLUG is not set
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 # CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
@@ -493,6 +503,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
 CONFIG_ARCH_ALL_STAGES_X86_32=y
 CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -511,6 +522,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
 CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
 CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
 CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
 # end of Chipset
 
 #
@@ -611,6 +623,7 @@ CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
 # CONFIG_BUILDING_WITH_DEBUG_FSP is not set
 CONFIG_FSP_VGA_MODE12_BPP=0x0
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
@@ -653,6 +666,11 @@ CONFIG_PCR_RUNTIME_DATA=3
 # end of Trusted Platform Module
 
 #
+# TCG storage
+#
+# end of TCG storage
+
+#
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -729,7 +747,6 @@ CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_ACPI_S1_NOT_SUPPORTED=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
 CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
 CONFIG_ACPI_NHLT=y
 
 #
@@ -796,11 +813,10 @@ CONFIG_DECOMPRESS_OFAST=y
 #
 # CONFIG_BMP_LOGO is not set
 CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
 # CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
 # end of Boot Logo Configuration
 
-CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode b/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
index e1de64a5..53ef97e9 100644
--- a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
@@ -170,6 +170,7 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/supermicro_x11_lga1151_series/ifd"
 CONFIG_ME_BIN_PATH="../../../vendorfiles/supermicro_x11_lga1151_series/me.bin"
 CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 CONFIG_USE_LEGACY_8254_TIMER=y
@@ -269,7 +270,6 @@ CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
 CONFIG_MAX_HECI_DEVICES=5
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
@@ -387,6 +387,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
 
 #
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
 # Intel SoC Common PCH Code
 #
 CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -427,6 +435,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_HAVE_SMI_HANDLER=y
 CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
 CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
 CONFIG_AP_STACK_SIZE=0x800
 CONFIG_SMP=y
@@ -448,6 +457,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_PCIEXP_HOTPLUG is not set
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 # CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
@@ -493,6 +503,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
 CONFIG_ARCH_ALL_STAGES_X86_32=y
 CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -511,6 +522,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
 CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
 CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
 CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
 # end of Chipset
 
 #
@@ -609,6 +621,7 @@ CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
 # CONFIG_BUILDING_WITH_DEBUG_FSP is not set
 CONFIG_FSP_VGA_MODE12_BPP=0x0
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
@@ -652,6 +665,11 @@ CONFIG_PCR_RUNTIME_DATA=3
 # end of Trusted Platform Module
 
 #
+# TCG storage
+#
+# end of TCG storage
+
+#
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -728,7 +746,6 @@ CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_ACPI_S1_NOT_SUPPORTED=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
 CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
 CONFIG_ACPI_NHLT=y
 
 #
@@ -795,11 +812,10 @@ CONFIG_DECOMPRESS_OFAST=y
 #
 # CONFIG_BMP_LOGO is not set
 CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
 # CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
 # end of Boot Logo Configuration
 
-CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y