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. --- .../hp820g2_12mb/config/libgfxinit_corebootfb | 31 +++++++--------------- .../hp820g2_12mb/config/libgfxinit_txtmode | 31 +++++++--------------- 2 files changed, 20 insertions(+), 42 deletions(-) (limited to 'config/coreboot/hp820g2_12mb') diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb b/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb index edfbbd17..d916c455 100644 --- a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb @@ -168,7 +168,6 @@ CONFIG_ME_BIN_PATH="../../../vendorfiles/hp820g2/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp820g2/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 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 @@ -212,7 +211,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_TPM_MEASURED_BOOT is not set CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set @@ -274,6 +272,13 @@ CONFIG_MRC_BIN_ADDRESS=0xfffa0000 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000 CONFIG_HAVE_REFCODE_BLOB=y CONFIG_REFCODE_BLOB_FILE="../../../mrc/broadwell/refcode" +CONFIG_SOC_INTEL_BROADWELL=y +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_DISABLE_ME_PCI=y CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6 CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 @@ -304,7 +309,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 @@ -320,20 +324,12 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_SOC_INTEL_BROADWELL=y -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 # # Southbridge # # CONFIG_PCIEXP_HOTPLUG is not set CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y -CONFIG_INTEL_LYNXPOINT_LP=y -CONFIG_DISABLE_ME_PCI=y -CONFIG_SOUTHBRIDGE_INTEL_WILDCATPOINT=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y @@ -376,7 +372,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 @@ -394,7 +389,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 # @@ -490,8 +484,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 @@ -535,11 +527,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -620,6 +607,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 # # System tables @@ -681,10 +669,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_REG_SCRIPT=y CONFIG_MAX_REBOOT_CNT=3 CONFIG_RELOCATABLE_MODULES=y diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode b/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode index 620d3a51..0641093b 100644 --- a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode @@ -166,7 +166,6 @@ CONFIG_ME_BIN_PATH="../../../vendorfiles/hp820g2/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp820g2/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 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 @@ -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_TPM_MEASURED_BOOT is not set CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set @@ -272,6 +270,13 @@ CONFIG_MRC_BIN_ADDRESS=0xfffa0000 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000 CONFIG_HAVE_REFCODE_BLOB=y CONFIG_REFCODE_BLOB_FILE="../../../mrc/broadwell/refcode" +CONFIG_SOC_INTEL_BROADWELL=y +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_DISABLE_ME_PCI=y CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6 CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 @@ -302,7 +307,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 @@ -318,20 +322,12 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_SOC_INTEL_BROADWELL=y -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 # # Southbridge # # CONFIG_PCIEXP_HOTPLUG is not set CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y -CONFIG_INTEL_LYNXPOINT_LP=y -CONFIG_DISABLE_ME_PCI=y -CONFIG_SOUTHBRIDGE_INTEL_WILDCATPOINT=y -CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y @@ -374,7 +370,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 @@ -392,7 +387,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 # @@ -486,8 +480,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 @@ -532,11 +524,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -617,6 +604,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 # # System tables @@ -678,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_REG_SCRIPT=y CONFIG_MAX_REBOOT_CNT=3 CONFIG_RELOCATABLE_MODULES=y -- cgit v1.2.1