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. --- .../e7240_12mb/config/libgfxinit_corebootfb | 32 ++++++++-------------- .../coreboot/e7240_12mb/config/libgfxinit_txtmode | 32 ++++++++-------------- 2 files changed, 22 insertions(+), 42 deletions(-) (limited to 'config/coreboot/e7240_12mb') diff --git a/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb b/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb index 90afa3df..6280c5ef 100644 --- a/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb @@ -155,7 +155,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 # CONFIG_BOARD_DELL_E4300 is not set # CONFIG_BOARD_DELL_E6400 is not set CONFIG_BOARD_DELL_LATITUDE_E7240=y -# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set # CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set # CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set # CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set @@ -192,7 +191,6 @@ CONFIG_GBE_BIN_PATH="../../../config/ifd/e7240/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set CONFIG_PCIEXP_AER=y -# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_STMICRO=y @@ -209,7 +207,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_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -266,6 +263,13 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_HPET_MIN_TICKS=0x80 +CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 +CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 +CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_INTEL_LYNXPOINT_LP=y +CONFIG_PCIEXP_COMMON_CLOCK=y +# CONFIG_SERIALIO_UART_CONSOLE is not set +CONFIG_DISABLE_ME_PCI=y CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6 CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 @@ -296,7 +300,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 @@ -312,9 +315,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_NORTHBRIDGE_INTEL_HASWELL=y CONFIG_USE_NATIVE_RAMINIT=y @@ -324,11 +324,7 @@ CONFIG_USE_NATIVE_RAMINIT=y # CONFIG_PCIEXP_HOTPLUG is not set CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y -CONFIG_INTEL_LYNXPOINT_LP=y CONFIG_FINALIZE_USB_ROUTE_XHCI=y -# CONFIG_SERIALIO_UART_CONSOLE is not set -CONFIG_DISABLE_ME_PCI=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -379,7 +375,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 @@ -397,7 +392,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 # @@ -480,6 +474,7 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set # CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set # CONFIG_DRIVERS_I2C_MAX98396 is not set +CONFIG_INTEL_DDI=y CONFIG_INTEL_GMA_ACPI=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -487,8 +482,6 @@ CONFIG_GFX_GMA_GENERATION="Haswell" CONFIG_GFX_GMA_PCH="Lynx_Point" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" -CONFIG_DRIVERS_INTEL_OC_MAILBOX=y -CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=y # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y @@ -525,11 +518,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -609,6 +597,7 @@ CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y CONFIG_HAVE_MONOTONIC_TIMER=y +CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y # @@ -673,10 +662,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/e7240_12mb/config/libgfxinit_txtmode b/config/coreboot/e7240_12mb/config/libgfxinit_txtmode index 3e63fc0f..e41d9461 100644 --- a/config/coreboot/e7240_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/e7240_12mb/config/libgfxinit_txtmode @@ -153,7 +153,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 # CONFIG_BOARD_DELL_E4300 is not set # CONFIG_BOARD_DELL_E6400 is not set CONFIG_BOARD_DELL_LATITUDE_E7240=y -# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set # CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set # CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set # CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set @@ -190,7 +189,6 @@ CONFIG_GBE_BIN_PATH="../../../config/ifd/e7240/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set CONFIG_PCIEXP_AER=y -# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_STMICRO=y @@ -207,7 +205,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_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -264,6 +261,13 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_HPET_MIN_TICKS=0x80 +CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 +CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 +CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_INTEL_LYNXPOINT_LP=y +CONFIG_PCIEXP_COMMON_CLOCK=y +# CONFIG_SERIALIO_UART_CONSOLE is not set +CONFIG_DISABLE_ME_PCI=y CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6 CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 @@ -294,7 +298,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 @@ -310,9 +313,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_NORTHBRIDGE_INTEL_HASWELL=y CONFIG_USE_NATIVE_RAMINIT=y @@ -322,11 +322,7 @@ CONFIG_USE_NATIVE_RAMINIT=y # CONFIG_PCIEXP_HOTPLUG is not set CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y -CONFIG_INTEL_LYNXPOINT_LP=y CONFIG_FINALIZE_USB_ROUTE_XHCI=y -# CONFIG_SERIALIO_UART_CONSOLE is not set -CONFIG_DISABLE_ME_PCI=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -377,7 +373,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 @@ -395,7 +390,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 # @@ -476,6 +470,7 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set # CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set # CONFIG_DRIVERS_I2C_MAX98396 is not set +CONFIG_INTEL_DDI=y CONFIG_INTEL_GMA_ACPI=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -483,8 +478,6 @@ CONFIG_GFX_GMA_GENERATION="Haswell" CONFIG_GFX_GMA_PCH="Lynx_Point" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" -CONFIG_DRIVERS_INTEL_OC_MAILBOX=y -CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=y # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y @@ -522,11 +515,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -606,6 +594,7 @@ CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y CONFIG_HAVE_MONOTONIC_TIMER=y +CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y # @@ -670,10 +659,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