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. --- .../macbook11/config/libgfxinit_corebootfb | 30 ++++++++-------------- .../coreboot/macbook11/config/libgfxinit_txtmode | 30 ++++++++-------------- 2 files changed, 22 insertions(+), 38 deletions(-) (limited to 'config/coreboot/macbook11') diff --git a/config/coreboot/macbook11/config/libgfxinit_corebootfb b/config/coreboot/macbook11/config/libgfxinit_corebootfb index a228b5db..3d5b2d70 100644 --- a/config/coreboot/macbook11/config/libgfxinit_corebootfb +++ b/config/coreboot/macbook11/config/libgfxinit_corebootfb @@ -116,9 +116,10 @@ CONFIG_VENDOR_APPLE=y # CONFIG_VENDOR_TOPTON is not set # CONFIG_VENDOR_UP is not set # CONFIG_VENDOR_VIA is not set +CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1" CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_MAINBOARD_DIR="apple/i945_macs" +CONFIG_MAINBOARD_DIR="apple/macbook21" CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DIMM_MAX=4 CONFIG_DIMM_SPD_SIZE=256 @@ -130,19 +131,17 @@ CONFIG_MAX_CPUS=2 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set CONFIG_POST_DEVICE=y CONFIG_POST_IO=y -CONFIG_VARIANT_DIR="macbook1_1" -CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" +CONFIG_OVERRIDE_DEVICETREE="" CONFIG_DEVICETREE="devicetree.cb" # CONFIG_VBOOT is not set # CONFIG_VGA_BIOS is not set # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set -CONFIG_BOARD_APPLE_MACBOOK11=y # CONFIG_BOARD_APPLE_MACBOOK21 is not set +CONFIG_BOARD_APPLE_MACBOOK11=y # CONFIG_BOARD_APPLE_IMAC52 is not set # CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set -CONFIG_BOARD_APPLE_I945_MACS_COMMON=y CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc." CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 @@ -180,7 +179,6 @@ CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 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_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -233,6 +231,10 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_HPET_MIN_TICKS=0x80 +CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 +CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 +CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_CBFS_CACHE_ALIGN=8 @@ -269,7 +271,6 @@ CONFIG_SETUP_XIP_CACHE=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_LAPIC_REMAP_MITIGATION=y CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 @@ -286,9 +287,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_NORTHBRIDGE_INTEL_I945=y CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_I945_LVDS=y @@ -298,7 +296,6 @@ CONFIG_I945_LVDS=y # CONFIG_PCIEXP_HOTPLUG=y CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y -# CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -335,7 +332,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_AP_IN_SIPI_WAIT=y @@ -355,7 +351,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 # @@ -477,11 +472,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -542,6 +532,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 CONFIG_HAVE_MP_TABLE=y @@ -599,10 +590,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/macbook11/config/libgfxinit_txtmode b/config/coreboot/macbook11/config/libgfxinit_txtmode index 8a74a550..d6f79eb3 100644 --- a/config/coreboot/macbook11/config/libgfxinit_txtmode +++ b/config/coreboot/macbook11/config/libgfxinit_txtmode @@ -116,9 +116,10 @@ CONFIG_VENDOR_APPLE=y # CONFIG_VENDOR_TOPTON is not set # CONFIG_VENDOR_UP is not set # CONFIG_VENDOR_VIA is not set +CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1" CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_MAINBOARD_DIR="apple/i945_macs" +CONFIG_MAINBOARD_DIR="apple/macbook21" CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DIMM_MAX=4 CONFIG_DIMM_SPD_SIZE=256 @@ -130,19 +131,17 @@ CONFIG_MAX_CPUS=2 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set CONFIG_POST_DEVICE=y CONFIG_POST_IO=y -CONFIG_VARIANT_DIR="macbook1_1" -CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" +CONFIG_OVERRIDE_DEVICETREE="" CONFIG_DEVICETREE="devicetree.cb" # CONFIG_VBOOT is not set # CONFIG_VGA_BIOS is not set # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set -CONFIG_BOARD_APPLE_MACBOOK11=y # CONFIG_BOARD_APPLE_MACBOOK21 is not set +CONFIG_BOARD_APPLE_MACBOOK11=y # CONFIG_BOARD_APPLE_IMAC52 is not set # CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set -CONFIG_BOARD_APPLE_I945_MACS_COMMON=y CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc." CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 @@ -180,7 +179,6 @@ CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 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_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -233,6 +231,10 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_HPET_MIN_TICKS=0x80 +CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 +CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 +CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_CBFS_CACHE_ALIGN=8 @@ -269,7 +271,6 @@ CONFIG_SETUP_XIP_CACHE=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_LAPIC_REMAP_MITIGATION=y CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 @@ -286,9 +287,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # # Northbridge # -CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 -CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 -CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_NORTHBRIDGE_INTEL_I945=y CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_I945_LVDS=y @@ -298,7 +296,6 @@ CONFIG_I945_LVDS=y # CONFIG_PCIEXP_HOTPLUG=y CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y -# CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y @@ -335,7 +332,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_AP_IN_SIPI_WAIT=y @@ -355,7 +351,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 # @@ -475,11 +470,6 @@ CONFIG_PCR_FW_VER=10 CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module -# -# TCG storage -# -# end of TCG storage - # # Memory initialization # @@ -540,6 +530,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 CONFIG_HAVE_MP_TABLE=y @@ -597,10 +588,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