From ad2d082bc23451d94e53539c304ddbf1b489d41c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 19 May 2026 11:54:05 +0100 Subject: 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. --- .../x280_vfsp_16mb/config/libgfxinit_corebootfb | 28 ++++------------------ .../x280_vfsp_16mb/config/libgfxinit_txtmode | 28 ++++------------------ 2 files changed, 10 insertions(+), 46 deletions(-) (limited to 'config/coreboot/x280_vfsp_16mb') diff --git a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb b/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb index ec882f31..d76f768a 100644 --- a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb @@ -171,7 +171,6 @@ CONFIG_ME_BIN_PATH="../../../vendorfiles/x280/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/x280/gbe" 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 @@ -181,10 +180,9 @@ CONFIG_HAVE_IFD_BIN=y # CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set # CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set # CONFIG_BOARD_LENOVO_L520 is not set -# CONFIG_BOARD_LENOVO_M720Q is not set -# CONFIG_BOARD_LENOVO_M920Q is not set # CONFIG_BOARD_LENOVO_M900 is not set # CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set +# CONFIG_BOARD_LENOVO_M920Q is not set # CONFIG_BOARD_LENOVO_S230U is not set # CONFIG_BOARD_LENOVO_T470S is not set # CONFIG_BOARD_LENOVO_T480 is not set @@ -243,7 +241,6 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 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_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -317,6 +314,7 @@ 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 @@ -428,14 +426,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y 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 # @@ -477,7 +467,6 @@ 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 @@ -499,7 +488,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_INTEL_DESCRIPTOR_MODE_CAPABLE=y # CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set @@ -554,7 +542,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_TOP4G_BOOTMEDIA_MAP=y @@ -572,7 +559,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 # @@ -683,7 +669,6 @@ CONFIG_GFX_GMA_GENERATION="Skylake" CONFIG_GFX_GMA_PCH="Sunrise_Point" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" -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 @@ -726,11 +711,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -812,6 +792,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 CONFIG_ACPI_NHLT=y # @@ -884,10 +865,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 diff --git a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode b/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode index db4db3fe..465cd1a4 100644 --- a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode @@ -169,7 +169,6 @@ CONFIG_ME_BIN_PATH="../../../vendorfiles/x280/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/x280/gbe" 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 @@ -179,10 +178,9 @@ CONFIG_HAVE_IFD_BIN=y # CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set # CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set # CONFIG_BOARD_LENOVO_L520 is not set -# CONFIG_BOARD_LENOVO_M720Q is not set -# CONFIG_BOARD_LENOVO_M920Q is not set # CONFIG_BOARD_LENOVO_M900 is not set # CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set +# CONFIG_BOARD_LENOVO_M920Q is not set # CONFIG_BOARD_LENOVO_S230U is not set # CONFIG_BOARD_LENOVO_T470S is not set # CONFIG_BOARD_LENOVO_T480 is not set @@ -241,7 +239,6 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 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_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -315,6 +312,7 @@ 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 @@ -426,14 +424,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y 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 # @@ -475,7 +465,6 @@ 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 @@ -497,7 +486,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_INTEL_DESCRIPTOR_MODE_CAPABLE=y # CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set @@ -552,7 +540,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_TOP4G_BOOTMEDIA_MAP=y @@ -570,7 +557,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 # @@ -675,7 +661,6 @@ CONFIG_GFX_GMA_GENERATION="Skylake" CONFIG_GFX_GMA_PCH="Sunrise_Point" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" -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 @@ -719,11 +704,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -805,6 +785,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 CONFIG_ACPI_NHLT=y # @@ -877,10 +858,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 -- cgit v1.2.1