Revert "cb/default: use rev 62c8197dd25376cb7b18d272af167cb176d28bcf"

This reverts commit fedeb6ecd8b5f3ed79dad754e452aecf88cbdde2.

this, along with several other updates, have been reverted.
dell 3050 micro had boot issues, on the update. i therefore
revert the recent revision update, pending further investigation.

1 files changed, 4 insertions, 32 deletions

diff --git a/config/coreboot/x2e_n150/config/fspgop b/config/coreboot/x2e_n150/config/fspgop
index 2ce472f7..2e041b74 100644
--- a/config/coreboot/x2e_n150/config/fspgop
+++ b/config/coreboot/x2e_n150/config/fspgop
@@ -179,8 +179,6 @@ CONFIG_FSP_TEMP_RAM_SIZE=0x20000
 CONFIG_HEAP_SIZE=0x100000
 # CONFIG_BOOTMEDIA_SMM_BWP is not set
 # CONFIG_DRIVERS_EFI_FW_INFO is not set
-# CONFIG_TCG_OPAL_S3_UNLOCK is not set
-CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_INTRUDER_SMI_ENABLE=y
 # CONFIG_TME_KEY_REGENERATION_ON_WARM_BOOT is not set
 # CONFIG_BOARD_TOPTON_X2F_N100 is not set
 CONFIG_BOARD_TOPTON_X2E_N150=y
@@ -278,12 +276,11 @@ CONFIG_FSP_PUBLISH_MBP_HOB=y
 # CONFIG_INCLUDE_HSPHY_IN_FMAP is not set
 CONFIG_HSPHY_FW_MAX_SIZE=0x8000
 CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_SLP_S0_FREQ_HZ=0x2005
-CONFIG_SOC_INTEL_SPI_DEV_MAX=4
-CONFIG_SOC_INTEL_SPI_PSF_DESTINATION_ID=0x23a8
 CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
 CONFIG_MAX_HECI_DEVICES=6
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_PAM0_REGISTER=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
 CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
 CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
@@ -419,24 +416,6 @@ 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_ESPI=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_GLOBAL_RESET_CSE_PMC=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_LOCKDOWN=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_PMUTIL=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_SMIHANDLER=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_SOUNDWIRE=y
-CONFIG_SOC_SOUNDWIRE_ACPI_ADDRESS=0x40000000
-CONFIG_SOC_SOUNDWIRE_MASTER_COUNT=4
-CONFIG_SOC_INTEL_COMMON_FEATURE_SPI_DEVFN=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_SPI_DEVFN_PSF=y
-CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
-
-#
 # Intel SoC Common PCH Code
 #
 CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -479,7 +458,6 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=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
@@ -501,7 +479,6 @@ 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_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -549,7 +526,6 @@ 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_CUSTOM_BOOTMEDIA=y
@@ -570,7 +546,6 @@ 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
 
 #
@@ -718,11 +693,6 @@ CONFIG_PCR_RUNTIME_DATA=3
 # end of Trusted Platform Module
 
 #
-# TCG storage
-#
-# end of TCG storage
-
-#
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -802,6 +772,7 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
 CONFIG_HAVE_ACPI_RESUME=y
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
+CONFIG_IOAPIC=y
 
 #
 # System tables
@@ -869,10 +840,11 @@ CONFIG_DECOMPRESS_OFAST=y
 #
 # CONFIG_BMP_LOGO is not set
 CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
+CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
 # 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