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. --- .../hp8460pintel_8mb/config/libgfxinit_corebootfb | 21 +++++++-------------- .../hp8460pintel_8mb/config/libgfxinit_txtmode | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) (limited to 'config/coreboot/hp8460pintel_8mb') diff --git a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb index 51509b63..62828ca6 100644 --- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb @@ -219,7 +219,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_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set @@ -278,6 +277,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 @@ -307,7 +310,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 @@ -323,9 +325,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 @@ -347,7 +346,6 @@ CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y CONFIG_HIDE_MEI_ON_ERROR=y 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 @@ -414,7 +412,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 @@ -434,7 +431,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 # @@ -578,11 +574,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -662,6 +653,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 # @@ -726,10 +718,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/hp8460pintel_8mb/config/libgfxinit_txtmode b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode index 82a2ffe0..b39ae120 100644 --- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode @@ -217,7 +217,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_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set @@ -276,6 +275,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 @@ -305,7 +308,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 @@ -321,9 +323,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 @@ -345,7 +344,6 @@ CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y CONFIG_HIDE_MEI_ON_ERROR=y 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 @@ -412,7 +410,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 @@ -432,7 +429,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 # @@ -575,11 +571,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -659,6 +650,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 # @@ -723,10 +715,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