From eed25bd2209a4c9f7c21a15689b5c90bd3757a6c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 21 Nov 2021 15:57:40 +0000 Subject: update coreboot and nuke tianocore tianocore is a liability for the libreboot project. it's a bloated mess, and unreliable, broken on many boards, and basically impossible to audit. i don't trust tianocore, so i'm removing it. --- resources/coreboot/macbook21/blobs.list | 22 ------- resources/coreboot/macbook21/board.cfg | 5 +- .../macbook21/config/libgfxinit_corebootfb | 12 ++-- .../coreboot/macbook21/config/libgfxinit_txtmode | 12 ++-- ...ok21-Set-default-VRAM-to-64MiB-instead-of.patch | 23 -------- ...02-add-c3-and-clockgen-to-apple-macbook21.patch | 68 ---------------------- 6 files changed, 13 insertions(+), 129 deletions(-) delete mode 100644 resources/coreboot/macbook21/blobs.list delete mode 100644 resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch delete mode 100644 resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch (limited to 'resources/coreboot/macbook21') diff --git a/resources/coreboot/macbook21/blobs.list b/resources/coreboot/macbook21/blobs.list deleted file mode 100644 index 05d3ee48..00000000 --- a/resources/coreboot/macbook21/blobs.list +++ /dev/null @@ -1,22 +0,0 @@ -src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c -3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c -3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c -3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_suspend.c -3rdparty/arm-trusted-firmware/plat/rockchip/rk3368/drivers/ddr/rk3368_ddr_reg_resume_V1.05.bin -3rdparty/chromeec/test/legacy_nvmem_dump.h -3rdparty/vboot/tests/futility/data/bios_link_mp.bin -3rdparty/vboot/tests/futility/data/bios_peppy_mp.bin -src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c -src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c -src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c -src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h -src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h -src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600111F_Enc.c -src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h -src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h -src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h -src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c -src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h -src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h -src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h -3rdparty/chromeec/third_party/bmi260/accelgyro_bmi260_config_tbin.h diff --git a/resources/coreboot/macbook21/board.cfg b/resources/coreboot/macbook21/board.cfg index 51ffb4d1..ec68265a 100644 --- a/resources/coreboot/macbook21/board.cfg +++ b/resources/coreboot/macbook21/board.cfg @@ -1,10 +1,7 @@ -cbtree="macbook21" +cbtree="default" romtype="i945 laptop" -cbrevision="acbbbede42dd00f93d8b39603dc7c052b389c43f" arch="x86_64" payload_grub="y" payload_grub_withseabios="y" -payload_grub_withtianocore="n" payload_seabios="y" -payload_tianocore="n" payload_memtest="y" diff --git a/resources/coreboot/macbook21/config/libgfxinit_corebootfb b/resources/coreboot/macbook21/config/libgfxinit_corebootfb index a7e8d67a..87c2d576 100644 --- a/resources/coreboot/macbook21/config/libgfxinit_corebootfb +++ b/resources/coreboot/macbook21/config/libgfxinit_corebootfb @@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000 CONFIG_DCACHE_RAM_SIZE=0x8000 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000 CONFIG_DCACHE_BSP_STACK_SIZE=0x2000 -CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 -CONFIG_MMCONF_BUS_NUMBER=64 +CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 +CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y @@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000 CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_RAMBASE=0xe00000 -CONFIG_CPU_ADDR_BITS=36 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d" CONFIG_EHCI_BAR=0xfef00000 +CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_STACK_SIZE=0x1000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254 @@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_AZALIA_MAX_CODECS=3 # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_TTYS0_BASE=0x3f8 CONFIG_TTYS0_LCS=3 CONFIG_UART_PCI_ADDR=0x0 -CONFIG_AZALIA_MAX_CODECS=3 CONFIG_INTEL_HAS_TOP_SWAP=y # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 @@ -333,12 +333,12 @@ CONFIG_LINEAR_FRAMEBUFFER=y # end of Display CONFIG_PCI=y -CONFIG_MMCONF_SUPPORT=y +CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y -CONFIG_MMCONF_LENGTH=0x04000000 +CONFIG_ECAM_MMCONF_LENGTH=0x04000000 CONFIG_PCI_ALLOW_BUS_MASTER=y CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y diff --git a/resources/coreboot/macbook21/config/libgfxinit_txtmode b/resources/coreboot/macbook21/config/libgfxinit_txtmode index e166b65b..564dd234 100644 --- a/resources/coreboot/macbook21/config/libgfxinit_txtmode +++ b/resources/coreboot/macbook21/config/libgfxinit_txtmode @@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000 CONFIG_DCACHE_RAM_SIZE=0x8000 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000 CONFIG_DCACHE_BSP_STACK_SIZE=0x2000 -CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 -CONFIG_MMCONF_BUS_NUMBER=64 +CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 +CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y @@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000 CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_RAMBASE=0xe00000 -CONFIG_CPU_ADDR_BITS=36 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d" CONFIG_EHCI_BAR=0xfef00000 +CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_STACK_SIZE=0x1000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254 @@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_AZALIA_MAX_CODECS=3 # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_TTYS0_BASE=0x3f8 CONFIG_TTYS0_LCS=3 CONFIG_UART_PCI_ADDR=0x0 -CONFIG_AZALIA_MAX_CODECS=3 CONFIG_INTEL_HAS_TOP_SWAP=y # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 @@ -331,12 +331,12 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y # end of Display CONFIG_PCI=y -CONFIG_MMCONF_SUPPORT=y +CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y -CONFIG_MMCONF_LENGTH=0x04000000 +CONFIG_ECAM_MMCONF_LENGTH=0x04000000 CONFIG_PCI_ALLOW_BUS_MASTER=y CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y diff --git a/resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch b/resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch deleted file mode 100644 index e1b0ee03..00000000 --- a/resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4ab0850279e98ccd715fca75813407046e9eac27 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Fri, 19 Mar 2021 05:54:58 +0000 -Subject: [PATCH 1/2] apple/macbook21: Set default VRAM to 64MiB instead of - 8MiB - ---- - src/mainboard/apple/macbook21/cmos.default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/apple/macbook21/cmos.default b/src/mainboard/apple/macbook21/cmos.default -index cf1bc4566e..dc0df3b6d6 100644 ---- a/src/mainboard/apple/macbook21/cmos.default -+++ b/src/mainboard/apple/macbook21/cmos.default -@@ -5,4 +5,4 @@ boot_devices='' - boot_default=0x40 - cmos_defaults_loaded=Yes - lpt=Enable --gfx_uma_size=8M -+gfx_uma_size=64M --- -2.25.1 - diff --git a/resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch b/resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch deleted file mode 100644 index 0921ab8c..00000000 --- a/resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3b03c7ce6499165959f1335a6b4d66d576c6b7ff Mon Sep 17 00:00:00 2001 -From: Vitali64 <5405891-vitali64yt@users.noreply.gitlab.com> -Date: Wed, 27 Oct 2021 13:36:01 +0200 -Subject: [PATCH 2/2] add c3 and clockgen to apple/macbook21 - ---- - src/mainboard/apple/macbook21/Kconfig | 1 + - src/mainboard/apple/macbook21/cstates.c | 13 +++++++++++++ - src/mainboard/apple/macbook21/devicetree.cb | 6 ++++++ - 3 files changed, 20 insertions(+) - -diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig -index 5f5ffde588..27377b737c 100644 ---- a/src/mainboard/apple/macbook21/Kconfig -+++ b/src/mainboard/apple/macbook21/Kconfig -@@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME - select I945_LVDS -+ select DRIVERS_I2C_CK505 - - config MAINBOARD_DIR - default "apple/macbook21" -diff --git a/src/mainboard/apple/macbook21/cstates.c b/src/mainboard/apple/macbook21/cstates.c -index 13d06f0839..88b8669c61 100644 ---- a/src/mainboard/apple/macbook21/cstates.c -+++ b/src/mainboard/apple/macbook21/cstates.c -@@ -29,6 +29,19 @@ static const acpi_cstate_t cst_entries[] = { - .addrh = 0, - } - }, -+ { -+ .ctype = 3, -+ .latency = 17, -+ .power = 250, -+ .resource = { -+ .space_id = ACPI_ADDRESS_SPACE_FIXED, -+ .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, -+ .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, -+ .access_size = ACPI_ACCESS_SIZE_UNDEFINED, -+ .addrl = 0x20, -+ .addrh = 0, -+ } -+ }, - }; - - int get_cst_entries(const acpi_cstate_t **entries) -diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb -index bcce778cb1..16025d6fbb 100644 ---- a/src/mainboard/apple/macbook21/devicetree.cb -+++ b/src/mainboard/apple/macbook21/devicetree.cb -@@ -104,7 +104,13 @@ chip northbridge/intel/i945 - end - device pci 1f.3 on # SMBUS - subsystemid 0x8086 0x7270 -+ chip drivers/i2c/ck505 -+ register "mask" = "{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }" -+ register "regs" = "{ 0x77, 0x77, 0x2d, 0x00, 0x21, 0x10, 0x3b, 0x06, 0x07, 0x0f, 0xf0, 0x01, 0x1e, 0x7f, 0x80, 0x80, 0x10, 0x08, 0x04, 0x01 }" -+ device i2c 69 on end -+ end - end -+ - end - end - end --- -2.25.1 - -- cgit v1.2.1