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. --- .../e6330_12mb/config/libgfxinit_corebootfb | 22 +++++++--------------- .../coreboot/e6330_12mb/config/libgfxinit_txtmode | 22 +++++++--------------- 2 files changed, 14 insertions(+), 30 deletions(-) (limited to 'config/coreboot/e6330_12mb') diff --git a/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb index 9833953c..8a326e29 100644 --- a/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb @@ -158,7 +158,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 is not set -# 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 @@ -210,7 +209,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 @@ -268,6 +266,10 @@ 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_PCIEXP_COMMON_CLOCK=y CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_CBFS_CACHE_ALIGN=8 @@ -297,7 +299,6 @@ CONFIG_TSC_SYNC_MFENCE=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_NEED_SMALL_2MB_PAGE_TABLES=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 @@ -313,9 +314,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_USE_NATIVE_RAMINIT=y CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set @@ -337,7 +335,6 @@ CONFIG_SOUTHBRIDGE_INTEL_C216=y # CONFIG_HIDE_MEI_ON_ERROR is not set CONFIG_PCIEXP_HOTPLUG=y CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -392,7 +389,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_HAVE_X86_64_SUPPORT=y CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y @@ -412,7 +408,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 # @@ -546,11 +541,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -612,6 +602,7 @@ CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y CONFIG_HAVE_MONOTONIC_TIMER=y CONFIG_HAVE_OPTION_TABLE=y +CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y # @@ -675,10 +666,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/e6330_12mb/config/libgfxinit_txtmode b/config/coreboot/e6330_12mb/config/libgfxinit_txtmode index 1ad38ec8..f53a3274 100644 --- a/config/coreboot/e6330_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/e6330_12mb/config/libgfxinit_txtmode @@ -156,7 +156,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 is not set -# 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 @@ -208,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 +264,10 @@ 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_PCIEXP_COMMON_CLOCK=y CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_CBFS_CACHE_ALIGN=8 @@ -295,7 +297,6 @@ CONFIG_TSC_SYNC_MFENCE=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_NEED_SMALL_2MB_PAGE_TABLES=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 @@ -311,9 +312,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_USE_NATIVE_RAMINIT=y CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set @@ -335,7 +333,6 @@ CONFIG_SOUTHBRIDGE_INTEL_C216=y # CONFIG_HIDE_MEI_ON_ERROR is not set CONFIG_PCIEXP_HOTPLUG=y CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -390,7 +387,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_HAVE_X86_64_SUPPORT=y CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y @@ -410,7 +406,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 # @@ -543,11 +538,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 +599,7 @@ CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y CONFIG_HAVE_MONOTONIC_TIMER=y CONFIG_HAVE_OPTION_TABLE=y +CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y # @@ -672,10 +663,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