diff options
90 files changed, 757 insertions, 2904 deletions
diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list index f6535149..55c2ee44 100644 --- a/config/data/coreboot/build.list +++ b/config/data/coreboot/build.list @@ -1 +1,2 @@ build/coreboot.rom +payloads/external/edk2/workspace/Build/UefiPayloadPkgX64/RELEASE_GCC/FV/UEFIPAYLOAD.fd diff --git a/config/data/coreboot/libreboot.bmp b/config/data/coreboot/libreboot.bmp Binary files differnew file mode 100644 index 00000000..adad7a9a --- /dev/null +++ b/config/data/coreboot/libreboot.bmp diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index a81db2bf..927b78c6 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -31,3 +31,7 @@ cbfscfg="" premake="corebootpremake" mkhelper="$if_not_dry_build coreboot_pad_one_byte" postmake="$if_not_dry_build mkcorebootbin" +cook_config="$if_not_dry_build cook_coreboot_config" + + + diff --git a/config/data/edk2/build.list b/config/data/edk2/build.list deleted file mode 100644 index 55c2ee44..00000000 --- a/config/data/edk2/build.list +++ /dev/null @@ -1,2 +0,0 @@ -build/coreboot.rom -payloads/external/edk2/workspace/Build/UefiPayloadPkgX64/RELEASE_GCC/FV/UEFIPAYLOAD.fd diff --git a/config/data/edk2/mkhelper.cfg b/config/data/edk2/mkhelper.cfg deleted file mode 100644 index 26f3180a..00000000 --- a/config/data/edk2/mkhelper.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -premake="echo TEST" -mkhelper="echo TEST" -postmake="echo TEST" diff --git a/config/data/grub/bootorder_edk2 b/config/data/grub/bootorder_edk2 deleted file mode 100644 index a66e1ec0..00000000 --- a/config/data/grub/bootorder_edk2 +++ /dev/null @@ -1 +0,0 @@ -/rom@img/edk2 diff --git a/config/module/edk2/default/patches/0008-copy-edk2-don-t-move-it.patch b/config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch index 6a5e9afa..31ef8761 100644 --- a/config/module/edk2/default/patches/0008-copy-edk2-don-t-move-it.patch +++ b/config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch @@ -1,20 +1,23 @@ -From da0ea93d3ba5e749380ea27f7c015ec8e4c32479 Mon Sep 17 00:00:00 2001 +From fb17486cd4edf6515d93b294546dd1ef4b9c1a3b Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> -Date: Tue, 22 Sep 2026 09:15:38 +0100 -Subject: [PATCH 8/9] copy edk2, don't move it +Date: Tue, 22 Sep 2026 08:01:01 +0100 +Subject: [PATCH 1/1] don't delete edk2 builds -then we will have it in build.list for lbmk +lbmk build.list needs to be able to copy this + +we rely on the coreboot build system to build +edk2, by providing a fake coreboot config. Signed-off-by: Leah Rowe <leah@libreboot.org> --- - payloads/external/edk2/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + payloads/external/edk2/Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile -index 948169d74a..d6f3d98001 100644 +index 75b7f7983d..d6f3d98001 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile -@@ -413,12 +413,12 @@ $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit: \ +@@ -413,19 +413,19 @@ $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit: \ UefiPayloadPkg: $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_GCC/FV/UEFIPAYLOAD.fd mkdir -p $(dir $(EDK2_UEFIPAYLOAD_OUT)) @@ -29,6 +32,16 @@ index 948169d74a..d6f3d98001 100644 $(EDK2_UNIVERSAL_PAYLOAD_OUT) clean: +- test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0 ++ test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0 + +-distclean: +- rm -rf $(WORKSPACE) ++distclean: clean ++ : + + .PHONY: $(EDK2_PATH) checktools logo UefiPayloadPkg UniversalPayload clean distclean + -- 2.47.3 diff --git a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg index 90f459cc..f612c168 100644 --- a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg @@ -11,3 +11,5 @@ vcfg="3040micro" build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg index 5b002ca4..bec4bc15 100644 --- a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg @@ -11,3 +11,5 @@ vcfg="3050micro" build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg index 1ee71c8c..3f9381f1 100644 --- a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg @@ -12,3 +12,5 @@ build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64cor IFD_platform="sklkbl" payload_uboot="amd64" payload_grubsea="y" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg b/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg index aef42794..28a73430 100644 --- a/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg @@ -8,7 +8,9 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="5050sff" -build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot edk2/mrchromebox" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" -payload_edk2="mrchromebox" + +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/dell7010sff_12mb/target.cfg b/config/module/coreboot/dell7010sff_12mb/target.cfg index 4b4303c9..cad9ab30 100644 --- a/config/module/coreboot/dell7010sff_12mb/target.cfg +++ b/config/module/coreboot/dell7010sff_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/dell780mt_8mb/target.cfg b/config/module/coreboot/dell780mt_8mb/target.cfg index af690aed..90fe2548 100644 --- a/config/module/coreboot/dell780mt_8mb/target.cfg +++ b/config/module/coreboot/dell780mt_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg index af690aed..90fe2548 100644 --- a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg +++ b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/dell780usff_8mb/target.cfg b/config/module/coreboot/dell780usff_8mb/target.cfg index af690aed..90fe2548 100644 --- a/config/module/coreboot/dell780usff_8mb/target.cfg +++ b/config/module/coreboot/dell780usff_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg index af690aed..90fe2548 100644 --- a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg +++ b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/e4300_4mb/target.cfg b/config/module/coreboot/e4300_4mb/target.cfg index f4d81d19..a7ad9910 100644 --- a/config/module/coreboot/e4300_4mb/target.cfg +++ b/config/module/coreboot/e4300_4mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e5420_6mb/target.cfg b/config/module/coreboot/e5420_6mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e5420_6mb/target.cfg +++ b/config/module/coreboot/e5420_6mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e5520_6mb/target.cfg b/config/module/coreboot/e5520_6mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e5520_6mb/target.cfg +++ b/config/module/coreboot/e5520_6mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e5530_12mb/target.cfg b/config/module/coreboot/e5530_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/e5530_12mb/target.cfg +++ b/config/module/coreboot/e5530_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6220_10mb/target.cfg b/config/module/coreboot/e6220_10mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e6220_10mb/target.cfg +++ b/config/module/coreboot/e6220_10mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6230_12mb/target.cfg b/config/module/coreboot/e6230_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/e6230_12mb/target.cfg +++ b/config/module/coreboot/e6230_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6320_10mb/target.cfg b/config/module/coreboot/e6320_10mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e6320_10mb/target.cfg +++ b/config/module/coreboot/e6320_10mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6330_12mb/target.cfg b/config/module/coreboot/e6330_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/e6330_12mb/target.cfg +++ b/config/module/coreboot/e6330_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6400_4mb/target.cfg b/config/module/coreboot/e6400_4mb/target.cfg index f7500e97..fc70f66a 100644 --- a/config/module/coreboot/e6400_4mb/target.cfg +++ b/config/module/coreboot/e6400_4mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="e6400" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6420_10mb/target.cfg b/config/module/coreboot/e6420_10mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e6420_10mb/target.cfg +++ b/config/module/coreboot/e6420_10mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6430_12mb/target.cfg b/config/module/coreboot/e6430_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/e6430_12mb/target.cfg +++ b/config/module/coreboot/e6430_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6520_10mb/target.cfg b/config/module/coreboot/e6520_10mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/e6520_10mb/target.cfg +++ b/config/module/coreboot/e6520_10mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/e6530_12mb/target.cfg b/config/module/coreboot/e6530_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/e6530_12mb/target.cfg +++ b/config/module/coreboot/e6530_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb b/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb new file mode 100644 index 00000000..5019ada7 --- /dev/null +++ b/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb @@ -0,0 +1,600 @@ +# +# Automatically generated file; DO NOT EDIT. +# coreboot configuration +# + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_CBFS_PREFIX="fallback" +CONFIG_COMPILER_GCC=y +# CONFIG_COMPILER_LLVM_CLANG is not set +# CONFIG_ANY_TOOLCHAIN is not set +# CONFIG_CCACHE is not set +# CONFIG_LTO is not set +# CONFIG_IWYU is not set +# CONFIG_FMD_GENPARSER is not set +# CONFIG_UTIL_GENPARSER is not set +# CONFIG_OPTION_BACKEND_NONE is not set +# CONFIG_USE_OPTION_TABLE is not set +CONFIG_USE_CBFS_FILE_OPTION_BACKEND=y +CONFIG_COMPRESS_RAMSTAGE_LZMA=y +# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +# CONFIG_COMPRESS_RAMSTAGE_ZSTD is not set +CONFIG_SEPARATE_ROMSTAGE=y +CONFIG_INCLUDE_CONFIG_FILE=y +CONFIG_COLLECT_TIMESTAMPS=y +# CONFIG_TIMESTAMPS_ON_CONSOLE is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set +# CONFIG_COVERAGE is not set +# CONFIG_UBSAN is not set +CONFIG_HAVE_ASAN_IN_ROMSTAGE=y +CONFIG_HAVE_ASAN_IN_RAMSTAGE=y +# CONFIG_ASAN is not set +CONFIG_NO_STAGE_CACHE=y +# CONFIG_CBMEM_STAGE_CACHE is not set +# CONFIG_UPDATE_IMAGE is not set +# CONFIG_BOOTSPLASH_IMAGE is not set + +# +# Software Bill Of Materials (SBOM) +# +# CONFIG_SBOM is not set +# end of Software Bill Of Materials (SBOM) +# end of General setup + +# +# Mainboard +# + +# +# Important: Run 'make distclean' before switching boards +# +# CONFIG_VENDOR_51NB is not set +# CONFIG_VENDOR_ACER is not set +# CONFIG_VENDOR_AMD is not set +# CONFIG_VENDOR_AOOSTAR is not set +# CONFIG_VENDOR_AOPEN is not set +# CONFIG_VENDOR_APPLE is not set +# CONFIG_VENDOR_ARM is not set +# CONFIG_VENDOR_ASROCK is not set +# CONFIG_VENDOR_ASUS is not set +# CONFIG_VENDOR_BIOSTAR is not set +# CONFIG_VENDOR_BOSTENTECH is not set +# CONFIG_VENDOR_BYTEDANCE is not set +# CONFIG_VENDOR_CAVIUM is not set +# CONFIG_VENDOR_CLEVO is not set +# CONFIG_VENDOR_COMPULAB is not set +# CONFIG_VENDOR_CWWK is not set +# CONFIG_VENDOR_DELL is not set +CONFIG_VENDOR_EMULATION=y +# CONFIG_VENDOR_ERYING is not set +# CONFIG_VENDOR_EXAMPLE is not set +# CONFIG_VENDOR_FACEBOOK is not set +# CONFIG_VENDOR_FOXCONN is not set +# CONFIG_VENDOR_FRAMEWORK is not set +# CONFIG_VENDOR_GETAC is not set +# CONFIG_VENDOR_GIGABYTE is not set +# CONFIG_VENDOR_GOOGLE is not set +# CONFIG_VENDOR_HARDKERNEL is not set +# CONFIG_VENDOR_HP is not set +# CONFIG_VENDOR_IBASE is not set +# CONFIG_VENDOR_IBM is not set +# CONFIG_VENDOR_INTEL is not set +# CONFIG_VENDOR_INVENTEC is not set +# CONFIG_VENDOR_KONTRON is not set +# CONFIG_VENDOR_LATTEPANDA is not set +# CONFIG_VENDOR_LENOVO is not set +# CONFIG_VENDOR_LIBRETREND is not set +# CONFIG_VENDOR_MITAC_COMPUTING is not set +# CONFIG_VENDOR_MSI is not set +# CONFIG_VENDOR_NOVACUSTOM is not set +# CONFIG_VENDOR_NVIDIA is not set +# CONFIG_VENDOR_OCP is not set +# CONFIG_VENDOR_OPENCELLULAR is not set +# CONFIG_VENDOR_PACKARDBELL is not set +# CONFIG_VENDOR_PCENGINES is not set +# CONFIG_VENDOR_PINE64 is not set +# CONFIG_VENDOR_PORTWELL is not set +# CONFIG_VENDOR_PRODRIVE is not set +# CONFIG_VENDOR_PROTECTLI is not set +# CONFIG_VENDOR_PURISM is not set +# CONFIG_VENDOR_QOTOM is not set +# CONFIG_VENDOR_RAPTOR_CS is not set +# CONFIG_VENDOR_RAZER is not set +# CONFIG_VENDOR_RODA is not set +# CONFIG_VENDOR_SAMSUNG is not set +# CONFIG_VENDOR_SAPPHIRE is not set +# CONFIG_VENDOR_SIEMENS is not set +# CONFIG_VENDOR_SIFIVE is not set +# CONFIG_VENDOR_STARLABS is not set +# CONFIG_VENDOR_SUPERMICRO is not set +# CONFIG_VENDOR_SYSTEM76 is not set +# CONFIG_VENDOR_TI is not set +# 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="edk2 crash test dummy" +CONFIG_MAINBOARD_VERSION="01189998819991197253" +CONFIG_MAINBOARD_DIR="emulation/qemu-i440fx" +CONFIG_DIMM_MAX=4 +CONFIG_DIMM_SPD_SIZE=256 +CONFIG_FMDFILE="" +# CONFIG_NO_POST is not set +CONFIG_MAINBOARD_VENDOR="edk2 crash test dummy corporation" +CONFIG_CBFS_SIZE=0xFFFFFF +CONFIG_CONSOLE_SERIAL=y +CONFIG_MAX_CPUS=4 +# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set +CONFIG_POST_DEVICE=y +CONFIG_POST_IO=y +CONFIG_UART_FOR_CONSOLE=0 +CONFIG_OVERRIDE_DEVICETREE="" +CONFIG_DEVICETREE="devicetree.cb" +# CONFIG_VBOOT is not set +CONFIG_VBOOT_VBNV_OFFSET=0x2c +CONFIG_IRQ_SLOT_COUNT=6 +# CONFIG_VGA_BIOS is not set +CONFIG_PCIEXP_ASPM=y +CONFIG_PCIEXP_CLK_PM=y +CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="EDK2 CRASH TEST DUMMY CORPORATION" +CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" +# CONFIG_FATAL_ASSERTS is not set +CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EDK2 CRASH TEST DUMMY" +# CONFIG_CONSOLE_POST is not set +CONFIG_MAX_SOCKET=1 +CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" +CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" +# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set +# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set +CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y +# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set +# CONFIG_BOARD_EMULATION_QEMU_POWER9 is not set +# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set +# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set +# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set +# CONFIG_BOARD_EMULATION_QEMU_SBSA is not set +# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set +CONFIG_DCACHE_RAM_BASE=0x10000 +CONFIG_DCACHE_RAM_SIZE=0x90000 +CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 +CONFIG_DCACHE_BSP_STACK_SIZE=0x4000 +CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 +CONFIG_DRIVERS_INTEL_WIFI=y +CONFIG_D3COLD_SUPPORT=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 +CONFIG_MAINBOARD_SERIAL_NUMBER="01189998819991197253" +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 +CONFIG_SYSTEM_SMBIOS_MANUFACTURER="EDK2 CRASH TEST CORPORATION" +CONFIG_EDK2_BOOT_TIMEOUT=2 +CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5 +CONFIG_CARDBUS_PLUGIN_SUPPORT=y +CONFIG_PS2K_EISAID="PNP0303" +CONFIG_PS2M_EISAID="PNP0F13" +CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y +CONFIG_EDK2_FOLLOW_BGRT_SPEC=y +# CONFIG_EDK2_FULL_SCREEN_SETUP is not set +CONFIG_TTYS0_BAUD=115200 +CONFIG_DRIVERS_UART_8250IO=y +CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 +CONFIG_HEAP_SIZE=0x100000 +CONFIG_EDK2_BOOTSPLASH_FILE="../../../config/data/coreboot/libreboot.bmp" +CONFIG_USE_PC_CMOS_ALTCENTURY=y +# CONFIG_DRIVERS_EFI_FW_INFO is not set +CONFIG_BOARD_ROMSIZE_KB_4096=y +# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set +CONFIG_COREBOOT_ROMSIZE_KB_16384=y +# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set +CONFIG_COREBOOT_ROMSIZE_KB=16384 +CONFIG_ROM_SIZE=0x01000000 +# end of Mainboard + +# +# Chipset +# + +# +# SoC +# +CONFIG_CHIPSET_DEVICETREE="" +CONFIG_CBFS_MCACHE_SIZE=0x4000 +CONFIG_ROMSTAGE_ADDR=0x2000000 +CONFIG_VERSTAGE_ADDR=0x2000000 +# CONFIG_USE_X86_64_SUPPORT is not set +CONFIG_CPU_PT_ROM_MAP_GB=4 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 +CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 +CONFIG_ACPI_CPU_STRING="CP%02X" +CONFIG_STACK_SIZE=0x2000 +CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254 +CONFIG_INTEL_GMA_BCLV_WIDTH=16 +CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 +CONFIG_INTEL_GMA_BCLM_WIDTH=16 +CONFIG_BOOTBLOCK_IN_CBFS=y +CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 +CONFIG_CBFS_CACHE_ALIGN=8 +# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set +CONFIG_FIXED_SMBUS_IO_BASE=0x400 +CONFIG_UART_BITBANG_TX_DELAY_MS=5 + +# +# CPU +# +CONFIG_CPU_QEMU_X86=y +CONFIG_PARALLEL_MP=y +CONFIG_XAPIC_ONLY=y +# CONFIG_X2APIC_ONLY is not set +# CONFIG_X2APIC_RUNTIME is not set +# CONFIG_X2APIC_LATE_WORKAROUND is not set +CONFIG_UDELAY_TSC=y +CONFIG_UNKNOWN_TSC_RATE=y +CONFIG_TSC_MONOTONIC_TIMER=y +CONFIG_NO_SMM=y +CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y +CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 +CONFIG_AP_STACK_SIZE=0x800 +CONFIG_SMP=y + +# +# Northbridge +# + +# +# Southbridge +# +# CONFIG_PCIEXP_HOTPLUG is not set +CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y +CONFIG_PCIEXP_COMMON_CLOCK=y +CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y +CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y +CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y +CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000 +CONFIG_RCBA_LENGTH=0x4000 + +# +# Super I/O +# + +# +# Embedded Controllers +# +CONFIG_ACPI_FNKEY_GEN_SCANCODE=0 +CONFIG_ARCH_X86=y +CONFIG_ARCH_BOOTBLOCK_X86_32=y +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_ALL_STAGES_X86_32=y +CONFIG_HAVE_X86_64_SUPPORT=y +CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_PC80_SYSTEM=y +CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_POSTCAR_STAGE=y +CONFIG_BOOTBLOCK_SIMPLE=y +# CONFIG_BOOTBLOCK_NORMAL is not set +CONFIG_COLLECT_TIMESTAMPS_TSC=y +CONFIG_IDT_IN_EVERY_STAGE=y +CONFIG_HAVE_CF9_RESET=y +CONFIG_DEBUG_HW_BREAKPOINTS=y +CONFIG_DEBUG_HW_BREAKPOINTS_IN_ALL_STAGES=y +CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y +CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS_IN_ALL_STAGES=y +# CONFIG_DUMP_SMBIOS_TYPE17 is not set +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 + +# +# Devices +# +CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y +CONFIG_HAVE_LINEAR_FRAMEBUFFER=y +CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y +CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y +CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y +CONFIG_NO_EARLY_GFX_INIT=y +CONFIG_ON_DEVICE_ROM_LOAD=y + +# +# Display +# +CONFIG_WANT_LINEAR_FRAMEBUFFER=y +# CONFIG_VGA_TEXT_FRAMEBUFFER is not set +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y +# CONFIG_BOOTSPLASH is not set +CONFIG_DEFAULT_SCREEN_ROTATION_INT=0 +# end of Display + +CONFIG_PCI=y +CONFIG_NO_ECAM_MMCONF_SUPPORT=y +CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_PCIEXP_PLUGIN_SUPPORT=y +CONFIG_PCI_ALLOW_BUS_MASTER=y +CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y +CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y +# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set +# CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_SOFTWARE_I2C is not set +CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 +CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y +# end of Devices + +# +# Generic Drivers +# +CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 +# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set +# CONFIG_ELOG is not set +# CONFIG_DRIVERS_HWID_DMI is not set +# CONFIG_DRIVERS_OPTION_CFR is not set +# CONFIG_SELF_TEST is not set +CONFIG_DRIVERS_UART=y +# CONFIG_DRIVERS_UART_OXPCIE is not set +# CONFIG_VPD is not set +CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y +CONFIG_DRIVERS_EMULATION_QEMU_CIRRUS=y +CONFIG_DRIVERS_EMULATION_QEMU_XRES=800 +CONFIG_DRIVERS_EMULATION_QEMU_YRES=600 +CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=y +# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set +# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set +# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set +# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set +# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set +# CONFIG_DRIVERS_I2C_MAX98396 is not set +# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set +# CONFIG_DRIVERS_PS2_KEYBOARD is not set +CONFIG_DRIVERS_MC146818=y +CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70 +CONFIG_VGA=y +# CONFIG_DRIVERS_SIL_3114 is not set +CONFIG_DRIVERS_WIFI_GENERIC=y +CONFIG_DRIVERS_MTK_WIFI=y +# end of Generic Drivers + +# +# Security +# + +# +# CBFS verification +# +# CONFIG_CBFS_VERIFICATION is not set +# end of CBFS verification + +# +# Verified Boot (vboot) +# +# end of Verified Boot (vboot) + +# +# Trusted Platform Module +# +CONFIG_NO_TPM=y +CONFIG_PCR_BOOT_MODE=1 +CONFIG_PCR_HWID=1 +CONFIG_PCR_SRTM=2 +CONFIG_PCR_FW_VER=10 +CONFIG_PCR_RUNTIME_DATA=3 +# end of Trusted Platform Module + +# +# TCG storage +# +# end of TCG storage + +# +# Memory initialization +# +CONFIG_PLATFORM_HAS_DRAM_CLEAR=y +# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set +# end of Memory initialization + +CONFIG_BOOTMEDIA_LOCK_NONE=y +# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set +# CONFIG_BOOTMEDIA_LOCK_CHIP is not set +# end of Security + +CONFIG_ACPI_HAVE_PCAT_8259=y +CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y +CONFIG_ACPI_NO_CUSTOM_MADT=y +CONFIG_ACPI_COMMON_MADT_LAPIC=y +CONFIG_ACPI_COMMON_MADT_IOAPIC=y +CONFIG_HAVE_ACPI_TABLES=y +CONFIG_BOOT_DEVICE_NOT_SPI_FLASH=y +CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y +CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y + +# +# Console +# +CONFIG_BOOTBLOCK_CONSOLE=y +CONFIG_POSTCAR_CONSOLE=y +CONFIG_SQUELCH_EARLY_SMP=y + +# +# I/O mapped, 8250-compatible +# +CONFIG_TTYS0_BASE=0x3f8 + +# +# Serial port base address = 0x3f8 +# +# CONFIG_CONSOLE_SERIAL_921600 is not set +# CONFIG_CONSOLE_SERIAL_460800 is not set +# CONFIG_CONSOLE_SERIAL_230400 is not set +CONFIG_CONSOLE_SERIAL_115200=y +# CONFIG_CONSOLE_SERIAL_57600 is not set +# CONFIG_CONSOLE_SERIAL_38400 is not set +# CONFIG_CONSOLE_SERIAL_19200 is not set +# CONFIG_CONSOLE_SERIAL_9600 is not set +CONFIG_TTYS0_LCS=3 +# CONFIG_SPKMODEM is not set +# CONFIG_CONSOLE_NE2K is not set +CONFIG_CONSOLE_CBMEM=y +# CONFIG_CONSOLE_I2C_SMBUS is not set +CONFIG_CONSOLE_QEMU_DEBUGCON=y +CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402 +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set +CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 +CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y +CONFIG_CONSOLE_USE_ANSI_ESCAPES=y +# CONFIG_CMOS_POST is not set +CONFIG_POST_DEVICE_NONE=y +# CONFIG_POST_DEVICE_LPC is not set +# CONFIG_POST_DEVICE_PCI_PCIE is not set +CONFIG_POST_IO_PORT=0x80 +CONFIG_HWBASE_DEBUG_CB=y +# end of Console + +CONFIG_HAVE_MONOTONIC_TIMER=y +CONFIG_HAVE_OPTION_TABLE=y +CONFIG_HAVE_PIRQ_TABLE=y + +# +# System tables +# +CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_SMBIOS_TABLES=y +CONFIG_BIOS_VENDOR="leahboot" +# end of System tables + +# +# Payload +# +# CONFIG_PAYLOAD_NONE is not set +# CONFIG_PAYLOAD_ELF is not set +# CONFIG_PAYLOAD_FLAT_BINARY is not set +# CONFIG_PAYLOAD_BOOTBOOT is not set +# CONFIG_PAYLOAD_CRABEFI is not set +# CONFIG_PAYLOAD_FILO is not set +# CONFIG_PAYLOAD_GRUB2 is not set +# CONFIG_PAYLOAD_SEAGRUB is not set +# CONFIG_PAYLOAD_LINUXBOOT is not set +# CONFIG_PAYLOAD_SEABIOS is not set +# CONFIG_PAYLOAD_UBOOT is not set +CONFIG_PAYLOAD_EDK2=y +# CONFIG_PAYLOAD_LINUX is not set +CONFIG_PAYLOAD_FILE="build/UEFIPAYLOAD.fd" +CONFIG_EDK2_UEFIPAYLOAD=y +# CONFIG_EDK2_UNIVERSAL_PAYLOAD is not set +CONFIG_EDK2_REPO_MRCHROMEBOX=y +# CONFIG_EDK2_REPO_OFFICIAL is not set +# CONFIG_EDK2_REPO_CUSTOM is not set +CONFIG_EDK2_REPOSITORY="https://github.com/mrchromebox/edk2" +CONFIG_EDK2_TAG_OR_REV="26.09" +# CONFIG_EDK2_USE_EDK2_PLATFORMS is not set +# CONFIG_EDK2_DEBUG is not set +CONFIG_EDK2_RELEASE=y +# CONFIG_EDK2_CBMEM_LOGGING is not set +CONFIG_EDK2_HAVE_EFI_SHELL=y +CONFIG_EDK2_PRIORITIZE_INTERNAL=y +CONFIG_EDK2_LOAD_OPTION_ROMS=y +CONFIG_EDK2_PS2_SUPPORT=y +CONFIG_EDK2_SD_MMC_TIMEOUT=10 +# CONFIG_EDK2_SERIAL_SUPPORT is not set +CONFIG_EDK2_USE_LVGL_RENDERER=y +# CONFIG_EDK2_DISABLE_TPM is not set +# CONFIG_EDK2_USE_LAPIC_TIMER is not set +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" +# CONFIG_EDK2_ENABLE_IPXE is not set +# CONFIG_PXE is not set +# CONFIG_COMPRESSED_PAYLOAD_NONE is not set +CONFIG_COMPRESSED_PAYLOAD_LZMA=y +# CONFIG_COMPRESSED_PAYLOAD_ZSTD is not set +# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set +CONFIG_COMPRESS_SECONDARY_PAYLOAD=y + +# +# Secondary Payloads +# +# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set +# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set +# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set +# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set +# CONFIG_SEABIOS_SECONDARY_PAYLOAD is not set +# CONFIG_TINT_SECONDARY_PAYLOAD is not set +# CONFIG_COREDOOM_SECONDARY_PAYLOAD is not set +# end of Secondary Payloads +# end of Payload + +# +# Debugging +# + +# +# CPU Debug Settings +# +# CONFIG_DISPLAY_MTRRS is not set + +# +# Vendorcode Debug Settings +# + +# +# BLOB Debug Settings +# + +# +# General Debug Settings +# +# CONFIG_GDB_STUB is not set +# CONFIG_DEBUG_CBFS is not set +# CONFIG_DEBUG_PIRQ is not set +CONFIG_HAVE_DEBUG_SMBUS=y +# CONFIG_DEBUG_SMBUS is not set +# CONFIG_DEBUG_MALLOC is not set +# CONFIG_DEBUG_CONSOLE_INIT is not set +# CONFIG_DEBUG_BOOT_STATE is not set +# CONFIG_DEBUG_ADA_CODE is not set +# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set +# end of Debugging + +CONFIG_DECOMPRESS_OFAST=y +CONFIG_PROBE_RAM=y + +# +# Boot Logo Configuration +# +# CONFIG_BMP_LOGO is not set +# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set +# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set +# end of Boot Logo Configuration + +CONFIG_MAX_REBOOT_CNT=3 +CONFIG_RELOCATABLE_MODULES=y +CONFIG_HAVE_BOOTBLOCK=y +CONFIG_HAVE_ROMSTAGE=y +CONFIG_HAVE_RAMSTAGE=y diff --git a/config/module/coreboot/edk2_mrchromebox/target.cfg b/config/module/coreboot/edk2_mrchromebox/target.cfg new file mode 100644 index 00000000..44324ba3 --- /dev/null +++ b/config/module/coreboot/edk2_mrchromebox/target.cfg @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +xarch="i386-elf" + +tree="default" + +release="n" diff --git a/config/module/coreboot/hp2170p_16mb/target.cfg b/config/module/coreboot/hp2170p_16mb/target.cfg index d6868831..026be097 100644 --- a/config/module/coreboot/hp2170p_16mb/target.cfg +++ b/config/module/coreboot/hp2170p_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2170p" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hp2560p_8mb/target.cfg b/config/module/coreboot/hp2560p_8mb/target.cfg index fce385d9..2d9e0c02 100644 --- a/config/module/coreboot/hp2560p_8mb/target.cfg +++ b/config/module/coreboot/hp2560p_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2560p" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hp2570p_16mb/target.cfg b/config/module/coreboot/hp2570p_16mb/target.cfg index 26c80f5f..db6931f3 100644 --- a/config/module/coreboot/hp2570p_16mb/target.cfg +++ b/config/module/coreboot/hp2570p_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2570p" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hp8200sff_4mb/target.cfg b/config/module/coreboot/hp8200sff_4mb/target.cfg index 887c1d73..833fcd0e 100644 --- a/config/module/coreboot/hp8200sff_4mb/target.cfg +++ b/config/module/coreboot/hp8200sff_4mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/hp8200sff_8mb/target.cfg b/config/module/coreboot/hp8200sff_8mb/target.cfg index 887c1d73..833fcd0e 100644 --- a/config/module/coreboot/hp8200sff_8mb/target.cfg +++ b/config/module/coreboot/hp8200sff_8mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/hp8300cmt_16mb/target.cfg b/config/module/coreboot/hp8300cmt_16mb/target.cfg index a2543da0..25a00e9c 100644 --- a/config/module/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/module/coreboot/hp8300cmt_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="ivybridge" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/hp8300usdt_16mb/target.cfg b/config/module/coreboot/hp8300usdt_16mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/module/coreboot/hp8300usdt_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hp8460pintel_8mb/target.cfg b/config/module/coreboot/hp8460pintel_8mb/target.cfg index 255bfac7..cc24e416 100644 --- a/config/module/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/module/coreboot/hp8460pintel_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp8460pintel" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hp8470pintel_16mb/target.cfg b/config/module/coreboot/hp8470pintel_16mb/target.cfg index 01b2ed5b..63c57506 100644 --- a/config/module/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/module/coreboot/hp8470pintel_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp8470pintel" -payload_uboot="amd64" + diff --git a/config/module/coreboot/hppro3500series_8mb/target.cfg b/config/module/coreboot/hppro3500series_8mb/target.cfg index 2cde02ea..11311fb4 100644 --- a/config/module/coreboot/hppro3500series_8mb/target.cfg +++ b/config/module/coreboot/hppro3500series_8mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hppro3500series" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/kfsn4_dre_1mb/target.cfg b/config/module/coreboot/kfsn4_dre_1mb/target.cfg index 46aee534..46f1bac1 100644 --- a/config/module/coreboot/kfsn4_dre_1mb/target.cfg +++ b/config/module/coreboot/kfsn4_dre_1mb/target.cfg @@ -4,5 +4,5 @@ tree="fam15h_15h" xarch="i386-elf" payload_seabios="y" payload_memtest="y" -build_depend="seabios/build memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build memtest86plus/default" + diff --git a/config/module/coreboot/kfsn4_dre_2mb/target.cfg b/config/module/coreboot/kfsn4_dre_2mb/target.cfg index 03ebe64d..cf92f09b 100644 --- a/config/module/coreboot/kfsn4_dre_2mb/target.cfg +++ b/config/module/coreboot/kfsn4_dre_2mb/target.cfg @@ -5,4 +5,4 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" payload_memtest="y" -payload_uboot="amd64" + diff --git a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg index 42256607..1b27939d 100644 --- a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg +++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg @@ -11,3 +11,5 @@ vcfg="supermicro_x11_lga1151_series" build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/t1650_12mb/target.cfg b/config/module/coreboot/t1650_12mb/target.cfg index 4b4303c9..cad9ab30 100644 --- a/config/module/coreboot/t1650_12mb/target.cfg +++ b/config/module/coreboot/t1650_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" -payload_uboot="amd64" +build_depend="seabios/build grub/nvme memtest86plus/default" + diff --git a/config/module/coreboot/t420_8mb/target.cfg b/config/module/coreboot/t420_8mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/t420_8mb/target.cfg +++ b/config/module/coreboot/t420_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/t420s_8mb/target.cfg b/config/module/coreboot/t420s_8mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/t420s_8mb/target.cfg +++ b/config/module/coreboot/t420s_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/t430_12mb/target.cfg b/config/module/coreboot/t430_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/t430_12mb/target.cfg +++ b/config/module/coreboot/t430_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/t480_vfsp_16mb/target.cfg b/config/module/coreboot/t480_vfsp_16mb/target.cfg index 582fb90a..7a0bf95e 100644 --- a/config/module/coreboot/t480_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t480_vfsp_16mb/target.cfg @@ -10,3 +10,5 @@ grubtree="xhci_nvme" vcfg="t480" build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/t480s_vfsp_16mb/target.cfg b/config/module/coreboot/t480s_vfsp_16mb/target.cfg index 803a39d5..d83adedf 100644 --- a/config/module/coreboot/t480s_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t480s_vfsp_16mb/target.cfg @@ -10,3 +10,5 @@ grubtree="xhci_nvme" vcfg="t480s" build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/t520_8mb/target.cfg b/config/module/coreboot/t520_8mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/t520_8mb/target.cfg +++ b/config/module/coreboot/t520_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/t530_12mb/target.cfg b/config/module/coreboot/t530_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/t530_12mb/target.cfg +++ b/config/module/coreboot/t530_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/t580_vfsp_16mb/target.cfg b/config/module/coreboot/t580_vfsp_16mb/target.cfg index 1b99df22..7dc6981a 100644 --- a/config/module/coreboot/t580_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t580_vfsp_16mb/target.cfg @@ -10,3 +10,5 @@ grubtree="xhci_nvme" vcfg="t580" build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/w530_12mb/target.cfg b/config/module/coreboot/w530_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/w530_12mb/target.cfg +++ b/config/module/coreboot/w530_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x220_8mb/target.cfg b/config/module/coreboot/x220_8mb/target.cfg index d7510b96..016ec46f 100644 --- a/config/module/coreboot/x220_8mb/target.cfg +++ b/config/module/coreboot/x220_8mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x230_12mb/target.cfg b/config/module/coreboot/x230_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/x230_12mb/target.cfg +++ b/config/module/coreboot/x230_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x230_16mb/target.cfg b/config/module/coreboot/x230_16mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/x230_16mb/target.cfg +++ b/config/module/coreboot/x230_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x230t_12mb/target.cfg b/config/module/coreboot/x230t_12mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/x230t_12mb/target.cfg +++ b/config/module/coreboot/x230t_12mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x230t_16mb/target.cfg b/config/module/coreboot/x230t_16mb/target.cfg index 595ad782..02b65b14 100644 --- a/config/module/coreboot/x230t_16mb/target.cfg +++ b/config/module/coreboot/x230t_16mb/target.cfg @@ -7,4 +7,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" -payload_uboot="amd64" + diff --git a/config/module/coreboot/x270_vfsp_16mb/target.cfg b/config/module/coreboot/x270_vfsp_16mb/target.cfg index 7789c54d..701ef4c9 100644 --- a/config/module/coreboot/x270_vfsp_16mb/target.cfg +++ b/config/module/coreboot/x270_vfsp_16mb/target.cfg @@ -10,3 +10,5 @@ grubtree="xhci_nvme" vcfg="x270" build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/coreboot/x280_vfsp_16mb/target.cfg b/config/module/coreboot/x280_vfsp_16mb/target.cfg index 22aa45b1..5cdbcdfa 100644 --- a/config/module/coreboot/x280_vfsp_16mb/target.cfg +++ b/config/module/coreboot/x280_vfsp_16mb/target.cfg @@ -10,3 +10,5 @@ grubtree="xhci_nvme" vcfg="x280" build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" +payload_edk2="edk2_mrchromebox" +build_depend="$build_depend coreboot/edk2_mrchromebox" diff --git a/config/module/edk2/default/nuke.list b/config/module/edk2/default/nuke.list deleted file mode 100644 index e6c247d2..00000000 --- a/config/module/edk2/default/nuke.list +++ /dev/null @@ -1,18 +0,0 @@ -3rdparty/fsp/EagleStreamFspBinPkg -3rdparty/fsp/MeteorLakeFspBinPkg -3rdparty/fsp/IceLakeFspBinPkg -3rdparty/fsp/AmberLakeFspBinPkg -3rdparty/fsp/DenvertonNSFspBinPkg -3rdparty/fsp/TigerLakeFspBinPkg -3rdparty/fsp/CedarIslandFspBinPkg -3rdparty/fsp/ElkhartLakeFspBinPkg -3rdparty/fsp/CometLakeFspBinPkg -3rdparty/fsp/WhitleyFspBinPkg -3rdparty/fsp/ArrowLakeFspBinPkg -3rdparty/fsp/IdavilleFspBinPkg -3rdparty/fsp/BraswellFspBinPkg -3rdparty/fsp/CoffeeLakeFspBinPkg -3rdparty/fsp/RaptorLakeFspBinPkg -3rdparty/fsp/ApolloLakeFspBinPkg -3rdparty/fsp/SkylakeFspBinPkg -3rdparty/vboot/tests diff --git a/config/module/edk2/default/patches/0001-Remove-warning-for-coreboot-images-built-without-a-p.patch b/config/module/edk2/default/patches/0001-Remove-warning-for-coreboot-images-built-without-a-p.patch deleted file mode 100644 index 8c922522..00000000 --- a/config/module/edk2/default/patches/0001-Remove-warning-for-coreboot-images-built-without-a-p.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c7797c30efd80203bf4c99da293921f658f6b677 Mon Sep 17 00:00:00 2001 -From: Nicholas Chin <nic.c3.14@gmail.com> -Date: Fri, 12 May 2023 19:55:15 -0600 -Subject: [PATCH 1/9] Remove warning for coreboot images built without a - payload - -I added this in upstream to prevent people from accidentally flashing -roms without a payload resulting in a no boot situation, but in -libreboot lbmk handles the payload and thus this warning always comes -up. This has caused confusion and concern so just patch it out. ---- - payloads/Makefile.mk | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/payloads/Makefile.mk b/payloads/Makefile.mk -index 5f988dac1b..516133880f 100644 ---- a/payloads/Makefile.mk -+++ b/payloads/Makefile.mk -@@ -50,16 +50,5 @@ distclean-payloads: - print-repo-info-payloads: - -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) - --ifeq ($(CONFIG_PAYLOAD_NONE),y) --show_notices:: warn_no_payload --endif -- --warn_no_payload: -- printf "\n\t** WARNING **\n" -- printf "coreboot has been built without a payload. Writing\n" -- printf "a coreboot image without a payload to your board's\n" -- printf "flash chip will result in a non-booting system. You\n" -- printf "can use cbfstool to add a payload to the image.\n\n" -- - .PHONY: force-payload coreinfo nvramcui --.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload -+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0002-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch b/config/module/edk2/default/patches/0002-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch deleted file mode 100644 index 4d379ea7..00000000 --- a/config/module/edk2/default/patches/0002-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ff67d8671b451ed391523dc139680b07594fb8c0 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sat, 20 Dec 2025 22:36:18 +0100 -Subject: [PATCH 2/9] tests/Makefile.mk: use 3rdparty/cmocka by default - -(tests) - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - tests/Makefile.mk | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/Makefile.mk b/tests/Makefile.mk -index ab302634ec..7e6f260b27 100644 ---- a/tests/Makefile.mk -+++ b/tests/Makefile.mk -@@ -25,7 +25,9 @@ TEST_LDFLAGS += --coverage - endif - - # Use system cmoka in default, or build from 3rdparty source code if requested --USE_SYSTEM_CMOCKA ?= 1 -+# PATCH NOTE: lbmk sets it to 0 by default. You can still override it to 1 -+# if you wish; upstream sets this to 1 by default, but we do 0 -+USE_SYSTEM_CMOCKA ?= 0 - ifeq ($(USE_SYSTEM_CMOCKA),1) - # Only probe for Cmocka (and possibly warn that it will be built from 3rdparty) - # when the requested goals actually build or run unit tests. Otherwise every --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0003-remove-Werror-tree-wide.patch b/config/module/edk2/default/patches/0003-remove-Werror-tree-wide.patch deleted file mode 100644 index bf37dd58..00000000 --- a/config/module/edk2/default/patches/0003-remove-Werror-tree-wide.patch +++ /dev/null @@ -1,718 +0,0 @@ -From 193253bf2437ba3d5d2ea4378157eb94b2f66bda Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 10:46:07 +0100 -Subject: [PATCH 3/9] remove -Werror tree-wide - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - Makefile.mk | 2 - - .../external/tint/tint-0.07_libpayload.patch | 70 +++++++++---------- - payloads/libpayload/Makefile.mk | 2 +- - payloads/libpayload/Makefile.payload | 2 +- - payloads/libpayload/sample/Makefile | 2 +- - payloads/libpayload/sample/arch_mock/Makefile | 2 +- - payloads/libpayload/tests/Makefile.mk | 2 +- - payloads/linuxcheck/Makefile | 2 +- - src/commonlib/gnat/Makefile.mk | 1 - - tests/Makefile.common | 2 +- - util/amdfwtool/Makefile.mk | 2 +- - util/archive/Makefile | 2 +- - util/bincfg/Makefile | 2 +- - util/bucts/Makefile | 2 +- - util/cbfstool/Makefile.mk | 2 +- - util/cbfstool/lz4/Makefile | 8 +-- - util/cbmem/Makefile | 2 +- - util/crossgcc/patches/gcc-15.2.0_libcpp.patch | 2 +- - util/ectool/Makefile | 2 +- - util/futility/Makefile.mk | 2 +- - util/ifdtool/Makefile.mk | 2 +- - util/intelvbttool/Makefile | 2 +- - ...fdata.c-fix-Werror-discarded-qualifi.patch | 4 +- - util/kconfig/patches/series | 2 +- - util/msrtool/configure | 2 +- - util/pmh7tool/Makefile | 2 +- - util/superiotool/Makefile | 6 +- - util/uio_usbdebug/Makefile | 2 +- - util/xcompile/xcompile | 2 +- - 29 files changed, 67 insertions(+), 70 deletions(-) - -diff --git a/Makefile.mk b/Makefile.mk -index 7a208d041d..f3480b1a28 100644 ---- a/Makefile.mk -+++ b/Makefile.mk -@@ -555,7 +555,6 @@ CFLAGS_common += -ffunction-sections - CFLAGS_common += -fdata-sections - CFLAGS_common += -fno-pie - CFLAGS_common += -Wstring-compare --CFLAGS_common += -Werror - ifeq ($(CONFIG_COMPILER_GCC),y) - CFLAGS_common += -Wold-style-declaration - CFLAGS_common += -Wcast-function-type -@@ -581,7 +580,6 @@ endif - ADAFLAGS_common += -gnatp - ADAFLAGS_common += -Wuninitialized - ADAFLAGS_common += -Wall --ADAFLAGS_common += -Werror - ADAFLAGS_common += -pipe - ADAFLAGS_common += -g - ADAFLAGS_common += -nostdinc -diff --git a/payloads/external/tint/tint-0.07_libpayload.patch b/payloads/external/tint/tint-0.07_libpayload.patch -index 6c9594a369..3d70539ffb 100644 ---- a/payloads/external/tint/tint-0.07_libpayload.patch -+++ b/payloads/external/tint/tint-0.07_libpayload.patch -@@ -4,7 +4,7 @@ diff -rupN tint-0.05/config.h tint/config.h - @@ -29,7 +29,15 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - +#include <libpayload.h> - +#include <curses.h> - + -@@ -15,7 +15,7 @@ diff -rupN tint-0.05/config.h tint/config.h - +#if 0 - const char scorefile[] = SCOREFILE; - +#endif -- -+ - #endif /* #ifndef CONFIG_H */ - diff -rupN tint-0.05/engine.c tint/engine.c - --- tint-0.05/engine.c 2005-07-17 13:26:22.000000000 +0200 -@@ -23,14 +23,14 @@ diff -rupN tint-0.05/engine.c tint/engine.c - @@ -27,10 +27,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - +#include "config.h" - + - +#if 0 - #include <stdlib.h> - #include <string.h> - +#endif -- -+ - -#include "typedefs.h" - #include "utils.h" - #include "io.h" -@@ -41,10 +41,10 @@ diff -rupN tint-0.05/engine.h tint/engine.h - @@ -29,7 +29,7 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - -#include "typedefs.h" /* bool */ - +#include "curses.h" /* bool */ -- -+ - /* - * Macros - diff -rupN tint-0.05/io.c tint/io.c -@@ -53,7 +53,7 @@ diff -rupN tint-0.05/io.c tint/io.c - @@ -27,9 +27,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - +#include "config.h" - + - +#if 0 -@@ -61,9 +61,9 @@ diff -rupN tint-0.05/io.c tint/io.c - #include <sys/time.h> /* gettimeofday() */ - #include <unistd.h> /* gettimeofday() */ - +#endif -- -+ - #include "io.h" -- -+ - @@ -68,7 +72,11 @@ static int in_timeleft; - /* Initialize screen */ - void io_init () -@@ -101,16 +101,16 @@ diff -rupN tint-0.05/io.c tint/io.c - +#endif - return ch; - } -- -+ - diff -rupN tint-0.05/io.h tint/io.h - --- tint-0.05/io.h 2010-06-23 14:55:03.000000000 +0100 - +++ tint/io.h 2021-02-09 08:00:00.000000000 +0200 - @@ -30,7 +30,6 @@ - */ -- -+ - #include <curses.h> - -#include <wchar.h> -- -+ - /* - * Colors - diff -rupN tint-0.05/Makefile tint/Makefile -@@ -166,7 +166,7 @@ diff -rupN tint-0.05/Makefile tint/Makefile - +HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a) - +LIB_CONFIG ?= configs/defconfig-tinycurses - + --+# CFLAGS := -Wall -Werror -Os -++# CFLAGS := -Wall -Os - +CFLAGS := -Wall -g -Os - +TARGET := tint - +OBJS := $(TARGET).o engine.o io.o utils.o -@@ -234,7 +234,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - @@ -27,6 +26,7 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - +#if 0 - #include <stdlib.h> - #include <stdio.h> -@@ -244,24 +244,24 @@ diff -rupN tint-0.05/tint.c tint/tint.c - #include <sys/types.h> - #include <unistd.h> - +#endif -- -+ - -#include "typedefs.h" - #include "utils.h" - #include "io.h" - #include "config.h" - @@ -304,7 +304,7 @@ static void showstatus (engine_t *engine - /***************************************************************************/ -- -+ - /* Header for scorefile */ - -#define SCORE_HEADER "Tint 0.02b (c) Abraham vd Merwe - Scores" - +#define SCORE_HEADER "Tint 0.05 (c) Abraham vd Merwe - Scores" -- -+ - /* Header for score title */ - static const char scoretitle[] = "\n\t TINT HIGH SCORES\n\n\tRank Score Name\n\n"; - @@ -322,6 +322,7 @@ typedef struct - time_t timestamp; - } score_t; -- -+ - +#if 0 - static void getname (char *name) - { -@@ -271,7 +271,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - } - } - +#endif -- -+ - +#if 0 - static void err1 () - { -@@ -281,7 +281,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - exit (EXIT_FAILURE); - } - +#endif -- -+ - void showplayerstats (engine_t *engine) - { - - fprintf (stderr, -@@ -292,7 +292,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - @@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine) - GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ()); - } -- -+ - +#if 0 - static void createscores (int score) - { -@@ -302,7 +302,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name); - } - +#endif -- -+ - +#if 0 - static int cmpscores (const void *a,const void *b) - { -@@ -312,7 +312,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - return 0; - } - +#endif -- -+ - +#if 0 - static void savescores (int score) - { -@@ -322,11 +322,11 @@ diff -rupN tint-0.05/tint.c tint/tint.c - fprintf (stderr,"\n"); - } - +#endif -- -+ - /***************************************************************************/ - /***************************************************************************/ - /***************************************************************************/ -- -+ - +#if 0 - static void showhelp () - { -@@ -336,7 +336,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - exit (EXIT_FAILURE); - } - +#endif -- -+ - static void parse_options (int argc,char *argv[]) - { - +#if 0 -@@ -349,12 +349,12 @@ diff -rupN tint-0.05/tint.c tint/tint.c - } - +#endif - } -- -+ - static void choose_level () - { - +#if 0 - char buf[NAMELEN]; -- -+ - do - @@ -557,6 +572,8 @@ static void choose_level () - buf[strlen (buf) - 1] = '\0'; -@@ -363,7 +363,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c - +#endif - + level = 1; - } -- -+ - /***************************************************************************/ - @@ -569,6 +586,8 @@ int main (int argc,char *argv[]) - int ch; -@@ -423,14 +423,14 @@ diff -rupN tint-0.05/tint.c tint/tint.c - exit (EXIT_SUCCESS); - +#endif - } -- -+ - diff -rupN tint-0.05/utils.c tint/utils.c - --- tint-0.05/utils.c 2001-12-07 16:49:19.000000000 +0100 - +++ tint/utils.c 2021-02-09 08:00:00.000000000 +0200 - @@ -27,11 +27,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - +#include "config.h" - + - +#if 0 -@@ -440,7 +440,7 @@ diff -rupN tint-0.05/utils.c tint/utils.c - - - -#include "typedefs.h" - +#endif -- -+ - /* - * Initialize random number generator - @@ -61,6 +63,7 @@ int rand_value (int range) -@@ -454,7 +454,7 @@ diff -rupN tint-0.05/utils.c tint/utils.c - @@ -69,3 +72,4 @@ bool str2int (int *i,const char *str) - return TRUE; - } -- -+ - +#endif - diff -rupN tint-0.05/utils.h tint/utils.h - --- tint-0.05/utils.h 2001-12-07 16:49:35.000000000 +0100 -@@ -462,9 +462,9 @@ diff -rupN tint-0.05/utils.h tint/utils.h - @@ -29,7 +29,7 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -- -+ - -#include "typedefs.h" - +#include <curses.h> -- -+ - /* - * Initialize random number generator -diff --git a/payloads/libpayload/Makefile.mk b/payloads/libpayload/Makefile.mk -index 0f5d1a0e11..45c2c5ad74 100644 ---- a/payloads/libpayload/Makefile.mk -+++ b/payloads/libpayload/Makefile.mk -@@ -80,7 +80,7 @@ CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer - CFLAGS += -ffunction-sections -fdata-sections - CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla - CFLAGS += -Wwrite-strings -Wredundant-decls -Wimplicit-fallthrough --CFLAGS += -Wstrict-aliasing -Wshadow -Wno-address-of-packed-member -Werror -+CFLAGS += -Wstrict-aliasing -Wshadow -Wno-address-of-packed-member - - ifeq ($(CONFIG_LP_LTO),y) - CFLAGS += -flto -diff --git a/payloads/libpayload/Makefile.payload b/payloads/libpayload/Makefile.payload -index 2eafd4bec3..c74704c58d 100644 ---- a/payloads/libpayload/Makefile.payload -+++ b/payloads/libpayload/Makefile.payload -@@ -84,7 +84,7 @@ endif - - CFLAGS = $(CFLAGS_$(ARCH)) - CFLAGS += -Os -ffreestanding --CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla -Werror -+CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla - ifeq ($(CONFIG_LP_LTO),y) - CFLAGS += -flto - endif -diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile -index 1249e9a017..269511d7df 100644 ---- a/payloads/libpayload/sample/Makefile -+++ b/payloads/libpayload/sample/Makefile -@@ -44,7 +44,7 @@ AS := $(AS_$(ARCH-y)) - LIBPAYLOAD_DIR := ../install/libpayload - XCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc - XAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas --CFLAGS := -fno-builtin -Wall -Werror -Os -+CFLAGS := -fno-builtin -Wall -Os - TARGET := hello - OBJS := $(TARGET).o - -diff --git a/payloads/libpayload/sample/arch_mock/Makefile b/payloads/libpayload/sample/arch_mock/Makefile -index a1e748111e..a146c2b3be 100644 ---- a/payloads/libpayload/sample/arch_mock/Makefile -+++ b/payloads/libpayload/sample/arch_mock/Makefile -@@ -12,7 +12,7 @@ CC := gcc - AS := as - OBJCOPY := objcopy - LIBPAYLOAD_DIR := ../../install/libpayload --CFLAGS := -fno-builtin -Wall -Werror -Os \ -+CFLAGS := -fno-builtin -Wall -Os \ - -include $(LIBPAYLOAD_DIR)/include/kconfig.h \ - -include $(LIBPAYLOAD_DIR)/include/compiler.h \ - -I $(LIBPAYLOAD_DIR)/include \ -diff --git a/payloads/libpayload/tests/Makefile.mk b/payloads/libpayload/tests/Makefile.mk -index 6b6c78d835..b2e7433b65 100644 ---- a/payloads/libpayload/tests/Makefile.mk -+++ b/payloads/libpayload/tests/Makefile.mk -@@ -45,7 +45,7 @@ TEST_CFLAGS += -I$(cmockasrc)/include - # Minimal subset of warnings and errors. Tests can be less strict than actual build. - TEST_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wvla - TEST_CFLAGS += -Wwrite-strings -Wno-address-of-packed-member -Wimplicit-fallthrough --TEST_CFLAGS += -Wstrict-aliasing -Wshadow -Werror -+TEST_CFLAGS += -Wstrict-aliasing -Wshadow - TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type - - TEST_CFLAGS += -std=gnu11 -ffunction-sections -fdata-sections -fno-builtin -diff --git a/payloads/linuxcheck/Makefile b/payloads/linuxcheck/Makefile -index 838c90df0c..a9d016db36 100644 ---- a/payloads/linuxcheck/Makefile -+++ b/payloads/linuxcheck/Makefile -@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile - # build libpayload and put .config file in $(CURDIR) instead of ../libpayload - # to avoid pollute the libpayload source directory and possible conflicts - LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config" --CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib -+CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib - ifeq ($(CONFIG_ARCH_X86),y) - TARGETARCH = i386 - endif -diff --git a/src/commonlib/gnat/Makefile.mk b/src/commonlib/gnat/Makefile.mk -index 773615c2cc..26891690cc 100644 ---- a/src/commonlib/gnat/Makefile.mk -+++ b/src/commonlib/gnat/Makefile.mk -@@ -12,7 +12,6 @@ ADAFLAGS_libgnat-$(1) := \ - -gnatpg \ - -I$(dir) \ - $$(GCC_ADAFLAGS_$(1)) \ -- -Werror \ - -fno-pie \ - - libgnat-$(1)-y += a-unccon.ads -diff --git a/tests/Makefile.common b/tests/Makefile.common -index 14cacaeca7..c35e312a79 100644 ---- a/tests/Makefile.common -+++ b/tests/Makefile.common -@@ -46,7 +46,7 @@ TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER)) - # -Wmissing-prototypes just make working with the test framework cumbersome. - # Only put conservative warnings here that really detect code that's obviously - # unintentional. --TEST_CFLAGS += -Wall -Werror -Wundef -Wstrict-prototypes -Wno-inline-asm -+TEST_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-inline-asm - TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type - TEST_CFLAGS += -Wno-array-compare -Wno-trigraphs - TEST_CFLAGS += -Wno-unused-but-set-variables -diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk -index 1f819d918f..f7dce01b71 100644 ---- a/util/amdfwtool/Makefile.mk -+++ b/util/amdfwtool/Makefile.mk -@@ -6,7 +6,7 @@ amdfwtoolobj = amdfwtool.o data_parse.o signed_psp.o handle_file.o opts.o soc.o - amdfwreadobj = amdfwread.o - amdfwheader = amdfwtool.h - --WERROR ?= -Werror -+WERROR = - AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow $(WERROR) - AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include - AMDFWTOOLCFLAGS += -I $(top)/src/ -diff --git a/util/archive/Makefile b/util/archive/Makefile -index 2de6a6294a..d301017253 100644 ---- a/util/archive/Makefile -+++ b/util/archive/Makefile -@@ -1,7 +1,7 @@ - ## SPDX-License-Identifier: GPL-2.0-only - PROGRAM = archive - HOSTCC ?= gcc --WERROR=-Werror -+WERROR= - CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR} - - SRCS = $(PROGRAM).c -diff --git a/util/bincfg/Makefile b/util/bincfg/Makefile -index dbcbc7711c..5f97f60f34 100644 ---- a/util/bincfg/Makefile -+++ b/util/bincfg/Makefile -@@ -3,7 +3,7 @@ CC = gcc - YACC = bison - LEX = flex - TARGET=bincfg --WERROR=-Werror -+WERROR= - CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR} - CFLAGS+=-Wno-unused-function - LDFLAGS= -lfl -diff --git a/util/bucts/Makefile b/util/bucts/Makefile -index d32258d1ec..50da491a8a 100644 ---- a/util/bucts/Makefile -+++ b/util/bucts/Makefile -@@ -3,7 +3,7 @@ CC:=gcc - OBJ:=bucts.o - TARGET=bucts - VERSION:=$(shell git describe) --WERROR=-Werror -+WERROR= - CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR} - - ifeq ($(shell uname), FreeBSD) -diff --git a/util/cbfstool/Makefile.mk b/util/cbfstool/Makefile.mk -index 315a9a751a..d195e4713a 100644 ---- a/util/cbfstool/Makefile.mk -+++ b/util/cbfstool/Makefile.mk -@@ -146,7 +146,7 @@ test_obj += fmap.o - test_obj += kv_pair.o - test_obj += valstr.o - --TOOLCFLAGS ?= -Werror -Wall -Wextra -Wshadow -+TOOLCFLAGS ?= -Wall -Wextra -Wshadow - TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow - TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings - TOOLCFLAGS += -O2 -diff --git a/util/cbfstool/lz4/Makefile b/util/cbfstool/lz4/Makefile -index d624e84703..be484c805f 100644 ---- a/util/cbfstool/lz4/Makefile -+++ b/util/cbfstool/lz4/Makefile -@@ -72,10 +72,10 @@ cmake: - @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE) - - gpptest: clean -- $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror" -+ $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align" - - clangtest: clean -- CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang -+ CFLAGS="-O3 -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang - - sanitize: clean - CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1 -@@ -84,8 +84,8 @@ staticAnalyze: clean - CFLAGS=-g clang-tidy $(CLANG_TIDY_CHECKS) $(CLANG_TIDY_ARGS) $(SRCS) - - armtest: clean -- CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc -- CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc -+ CFLAGS="-O3" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc -+ CFLAGS="-O3" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc - - versionsTest: clean - $(MAKE) -C versionsTest -diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile -index c0dfcbdc52..fe2891be6d 100644 ---- a/util/cbmem/Makefile -+++ b/util/cbmem/Makefile -@@ -9,7 +9,7 @@ CC ?= $(CROSS_COMPILE)gcc - INSTALL ?= /usr/bin/env install - PREFIX ?= /usr/local - CFLAGS ?= -O2 --WERROR=-Werror -+WERROR= - CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wshadow $(WERROR) - CFLAGS += -std=gnu23 - CPPFLAGS += -I . -I $(ROOT)/commonlib/include -I $(ROOT)/commonlib/bsd/include -diff --git a/util/crossgcc/patches/gcc-15.2.0_libcpp.patch b/util/crossgcc/patches/gcc-15.2.0_libcpp.patch -index ba60732f72..f1dc6aa2d6 100644 ---- a/util/crossgcc/patches/gcc-15.2.0_libcpp.patch -+++ b/util/crossgcc/patches/gcc-15.2.0_libcpp.patch -@@ -1,4 +1,4 @@ --GCC with `-Wformat-security -Werror=format-security` hardening options enabled -+GCC with `-Wformat-security =format-security` hardening options enabled - by default rejects some codes in libcpp. This patch fixes them. - - --- gcc-15-20250112/libcpp/expr.cc.bak -diff --git a/util/ectool/Makefile b/util/ectool/Makefile -index a90773e5c6..5724ac6009 100644 ---- a/util/ectool/Makefile -+++ b/util/ectool/Makefile -@@ -1,7 +1,7 @@ - ## SPDX-License-Identifier: GPL-2.0-only - - CC ?= gcc --WERROR=-Werror -+WERROR= - CFLAGS = -O2 -Wall -Wextra -Wshadow $(WERROR) - PROGRAM = ectool - INSTALL ?= /usr/bin/env install -diff --git a/util/futility/Makefile.mk b/util/futility/Makefile.mk -index a7bcee50d3..ba930a046b 100644 ---- a/util/futility/Makefile.mk -+++ b/util/futility/Makefile.mk -@@ -10,7 +10,7 @@ $(VBOOT_FUTILITY): | check-openssl-presence - unset CFLAGS LDFLAGS; $(MAKE) -C $(VBOOT_SOURCE) \ - BUILD=$(VBOOT_HOST_BUILD) \ - CC="$(HOSTCC)" \ -- WERROR="-Werror -Wno-deprecated-declarations" \ -+ WERROR=" -Wno-deprecated-declarations" \ - PKG_CONFIG="$(HOSTPKGCONFIG)" \ - V=$(V) \ - USE_FLASHROM=0 \ -diff --git a/util/ifdtool/Makefile.mk b/util/ifdtool/Makefile.mk -index 53506469d3..57d192ccb8 100644 ---- a/util/ifdtool/Makefile.mk -+++ b/util/ifdtool/Makefile.mk -@@ -2,7 +2,7 @@ - - ifdtoolobj = ifdtool.o fmap.o kv_pair.o valstr.o - --IFDTOOLCFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror -+IFDTOOLCFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes - IFDTOOLCFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include - IFDTOOLCFLAGS += -I$(top)/util/cbfstool/flashmap - IFDTOOLCFLAGS += -include $(top)/src/commonlib/bsd/include/commonlib/bsd/compiler.h -diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile -index 5c770dec9e..8963263354 100644 ---- a/util/intelvbttool/Makefile -+++ b/util/intelvbttool/Makefile -@@ -6,7 +6,7 @@ CC ?= gcc - INSTALL ?= /usr/bin/env install - PREFIX ?= /usr/local - CFLAGS ?= -O2 -g --CFLAGS += -Wall -Werror -+CFLAGS += -Wall - CFLAGS += -I../../src/commonlib/include -I ../../src/commonlib/bsd/include - - all: $(PROGRAM) -diff --git a/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch b/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch -index a367256102..401061d6c5 100644 ---- a/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch -+++ b/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch -@@ -1,7 +1,7 @@ - From 2a1a1d1b305ab276279234f70410bb6486a2049f Mon Sep 17 00:00:00 2001 - From: Mike Banon <mikebdp2@gmail.com> - Date: Tue, 10 Mar 2026 00:14:58 +0100 --Subject: [PATCH] util/kconfig/confdata.c: fix -Werror=discarded-qualifiers -+Subject: [PATCH] util/kconfig/confdata.c: fix =discarded-qualifiers - - In conf_read_simple(), strchr() is called on 'sym_name', which is - declared const char. The function returns a char that discards the -@@ -36,6 +36,6 @@ index 0105917..ae6ae2b 100644 - int i, def_flags; - - const char *warn_unknown, *sym_name; - + const char *warn_unknown; -- -+ - warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS"); - if (name) { -diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series -index 31d446ef81..739bee9279 100644 ---- a/util/kconfig/patches/series -+++ b/util/kconfig/patches/series -@@ -8,4 +8,4 @@ - 0013-util-kconfig-detect-ncurses-on-FreeBSD.patch - 0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch - 0015-fix-incorrect-spdx-strings.patch --0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch -+0016-util-kconfig-confdata.c-fix-discarded-qualifi.patch -diff --git a/util/msrtool/configure b/util/msrtool/configure -index 659cbcd66b..0415e4d9c9 100755 ---- a/util/msrtool/configure -+++ b/util/msrtool/configure -@@ -133,7 +133,7 @@ CC=`findprog "compiler" "${CC}" clang gcc cc icc` || exit - INSTALL=`findprog "install" "${INSTALL}" install ginstall` || exit - - test -n "$DEBUG" && myCFLAGS="-O2 -g" || myCFLAGS="-Os" --CFLAGS="${CFLAGS} ${myCFLAGS} -Wall -Werror" -+CFLAGS="${CFLAGS} ${myCFLAGS} -Wall " - - cat > .config.c << EOF - #include <pci/pci.h> -diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile -index 0a2ebbe147..c04d7e9bf9 100644 ---- a/util/pmh7tool/Makefile -+++ b/util/pmh7tool/Makefile -@@ -1,7 +1,7 @@ - ## SPDX-License-Identifier: GPL-2.0-only - - CC = gcc --CFLAGS = -O2 -Wall -Wextra -Werror -+CFLAGS = -O2 -Wall -Wextra - PROGRAM = pmh7tool - INSTALL = /usr/bin/env install - PREFIX = /usr/local -diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile -index 2dcfc9e929..2aad3b92e5 100644 ---- a/util/superiotool/Makefile -+++ b/util/superiotool/Makefile -@@ -12,7 +12,7 @@ PREFIX ?= /usr/local - VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"' - - CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \ -- -Werror-implicit-function-declaration -std=c11 -pedantic $(VERSION) \ -+ -implicit-function-declaration -std=c11 -pedantic $(VERSION) \ - -Wno-variadic-macros -I $(TOP)/src/commonlib/bsd/include - LDFLAGS += -lz - -@@ -24,8 +24,8 @@ ifeq ($(OS_ARCH), Darwin) - LIBS = -framework IOKit -framework DirectHW -lpci -lz - endif - ifeq ($(OS_ARCH), FreeBSD) --CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ -- -Werror-implicit-function-declaration -std=c11 $(VERSION) \ -+CFLAGS = -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \ -+ -implicit-function-declaration -std=c11 $(VERSION) \ - -I/usr/local/include - LDFLAGS += -L/usr/local/lib - LIBS = -lz -diff --git a/util/uio_usbdebug/Makefile b/util/uio_usbdebug/Makefile -index af1cc8e1ec..8a3603c41d 100644 ---- a/util/uio_usbdebug/Makefile -+++ b/util/uio_usbdebug/Makefile -@@ -30,7 +30,7 @@ KCONFIG_H := ../../src/include/kconfig.h - - CFLAGS += \ - -m32 -g \ -- -Wall -Wextra -Werror \ -+ -Wall -Wextra \ - -Wno-unused-parameter -Wno-error=sign-compare - CPPFLAGS += \ - -Iinclude/ \ -diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile -index f88da69306..02d134c8e8 100755 ---- a/util/xcompile/xcompile -+++ b/util/xcompile/xcompile -@@ -124,7 +124,7 @@ testcc() { - local tmp_o="$TMPFILE.o" - rm -f "$tmp_c" "$tmp_o" - echo "void _start(void) {}" >"$tmp_c" -- "$cc" -nostdlib -Werror $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1 -+ "$cc" -nostdlib $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1 - } - - testld() { --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0004-Remove-KCONFIG_WERROR.patch b/config/module/edk2/default/patches/0004-Remove-KCONFIG_WERROR.patch deleted file mode 100644 index 04038189..00000000 --- a/config/module/edk2/default/patches/0004-Remove-KCONFIG_WERROR.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 2676e5c95bb583db83cadb932a82977c8cdb2c20 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 11:20:54 +0100 -Subject: [PATCH 4/9] Remove KCONFIG_WERROR - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - Documentation/getting_started/kconfig.md | 3 --- - Makefile | 4 ---- - util/kconfig/Makefile | 4 ---- - util/kconfig/confdata.c | 2 -- - util/kconfig/symbol.c | 2 -- - 5 files changed, 15 deletions(-) - -diff --git a/Documentation/getting_started/kconfig.md b/Documentation/getting_started/kconfig.md -index 2917c53aae..6c4102ba17 100644 ---- a/Documentation/getting_started/kconfig.md -+++ b/Documentation/getting_started/kconfig.md -@@ -99,9 +99,6 @@ included in the Linux version. - - KCONFIG_SPLITCONFIG=”directory name for individual SYMBOL.h files”. - coreboot sets this to $(obj)/config. - --- KCONFIG_WERROR=value. Define to enable warnings as errors. This is enabled -- in coreboot, and should not be changed. -- - #### Used only for ‘make menuconfig’ - - MENUCONFIG_MODE=single_menu. Set to "single_menu" to enable. All other - values disable the option. This makes submenus appear below the menu option -diff --git a/Makefile b/Makefile -index 6a36b5968f..35576f3734 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,6 @@ KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd - KCONFIG_SPLITCONFIG := $(obj)/config/ - KCONFIG_TRISTATE := $(obj)/tristate.conf - KCONFIG_NEGATIVES := 1 --KCONFIG_WERROR := 1 - KCONFIG_WARN_UNKNOWN_SYMBOLS := 1 - KCONFIG_PACKAGE := CB.Config - KCONFIG_MAKEFILE_REAL ?= $(objk)/Makefile.real -@@ -39,9 +38,6 @@ KCONFIG_MAKEFILE_REAL ?= $(objk)/Makefile.real - COREBOOT_EXPORTS += KCONFIG_CONFIG KCONFIG_AUTOHEADER KCONFIG_AUTOCONFIG - COREBOOT_EXPORTS += KCONFIG_DEPENDENCIES KCONFIG_SPLITCONFIG KCONFIG_TRISTATE - COREBOOT_EXPORTS += KCONFIG_NEGATIVES --ifeq ($(filter %config,$(MAKECMDGOALS)),) --COREBOOT_EXPORTS += KCONFIG_WERROR --endif - COREBOOT_EXPORTS += KCONFIG_WARN_UNKNOWN_SYMBOLS - COREBOOT_EXPORTS += KCONFIG_AUTOADS KCONFIG_PACKAGE - COREBOOT_EXPORTS += KCONFIG_RUSTCCFG -diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile -index 76cc2c5e2c..45366936fc 100644 ---- a/util/kconfig/Makefile -+++ b/util/kconfig/Makefile -@@ -31,10 +31,6 @@ ifneq ($(findstring c, $(KBUILD_EXTRA_WARN)),) - export KCONFIG_WARN_UNKNOWN_SYMBOLS=1 - endif - --ifneq ($(findstring e, $(KBUILD_EXTRA_WARN)),) --export KCONFIG_WERROR=1 --endif -- - # We need this, in case the user has it in its environment - unexport CONFIG_ - -diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c -index ae6ae2b3d3..fa09647f44 100644 ---- a/util/kconfig/confdata.c -+++ b/util/kconfig/confdata.c -@@ -157,8 +157,6 @@ static int conf_lineno, conf_warnings; - - bool conf_errors(void) - { -- if (conf_warnings) -- return getenv("KCONFIG_WERROR"); - return false; - } - -diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c -index 3afe5be2d4..1a24d458cb 100644 ---- a/util/kconfig/symbol.c -+++ b/util/kconfig/symbol.c -@@ -317,8 +317,6 @@ static void sym_warn_unmet_dep(struct symbol *sym) - - bool sym_dep_errors(void) - { -- if (sym_warnings) -- return getenv("KCONFIG_WERROR"); - return false; - } - --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0006-don-t-delete-edk2.patch b/config/module/edk2/default/patches/0006-don-t-delete-edk2.patch deleted file mode 100644 index 74272902..00000000 --- a/config/module/edk2/default/patches/0006-don-t-delete-edk2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d952ebf5ff9ef68424cc1c85b4e2adfabebdb24e Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Tue, 22 Sep 2026 08:01:01 +0100 -Subject: [PATCH 6/9] don't delete edk2 - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - payloads/external/edk2/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile -index 75b7f7983d..05df683fed 100644 ---- a/payloads/external/edk2/Makefile -+++ b/payloads/external/edk2/Makefile -@@ -424,8 +424,8 @@ UniversalPayload: $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit - clean: - test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0 - --distclean: -- rm -rf $(WORKSPACE) -+distclean: clean -+ : - - .PHONY: $(EDK2_PATH) checktools logo UefiPayloadPkg UniversalPayload clean distclean - --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0007-don-t-delete-build.patch b/config/module/edk2/default/patches/0007-don-t-delete-build.patch deleted file mode 100644 index fa320332..00000000 --- a/config/module/edk2/default/patches/0007-don-t-delete-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8227a6b08675fbd31bcee9b9143a73dd75be813e Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Tue, 22 Sep 2026 08:56:32 +0100 -Subject: [PATCH 7/9] don't delete build - -lbmk build.list needs to be able to copy this - -it also means that we will then have the ability -to quickly re-use old build artifacts on re-build. - -this is a highly experimental edk2 integration in -lbmk. when i implement it properly, lbmk will have -its own logic for everything, without relying on -the coreboot build system. i'm only doing it this -way for now as a proof of concept, to show that -edk2 can work in libreboot. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - payloads/external/edk2/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile -index 05df683fed..948169d74a 100644 ---- a/payloads/external/edk2/Makefile -+++ b/payloads/external/edk2/Makefile -@@ -422,7 +422,7 @@ UniversalPayload: $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit - $(EDK2_UNIVERSAL_PAYLOAD_OUT) - - clean: -- test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0 -+ test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0 - - distclean: clean - : --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0009-move-crossgcc-to-crossgcc_orig-and-symlink.patch b/config/module/edk2/default/patches/0009-move-crossgcc-to-crossgcc_orig-and-symlink.patch deleted file mode 100644 index ba744512..00000000 --- a/config/module/edk2/default/patches/0009-move-crossgcc-to-crossgcc_orig-and-symlink.patch +++ /dev/null @@ -1,215 +0,0 @@ -From b346f014103c88b9f2cf2a439c6156a4b0e699f1 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Tue, 22 Sep 2026 09:17:41 +0100 -Subject: [PATCH 9/9] move crossgcc to crossgcc_orig, and symlink - -make a symlink for crossgcc/ for us to re-use -from libreboot. - -this patch will have to be maintained according -to whatever xarch is set to in edk2 lbmk, but -it will probably always be default, and thus -this patch will always be correct. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc | 1 + - util/crossgcc/tarballs/.empty | 0 - util/{crossgcc => crossgcc_orig}/.gitignore | 0 - util/{crossgcc => crossgcc_orig}/Makefile | 0 - util/{crossgcc => crossgcc_orig}/Makefile.mk | 0 - util/{crossgcc => crossgcc_orig}/README | 0 - util/{crossgcc => crossgcc_orig}/buildgcc | 0 - util/{crossgcc => crossgcc_orig}/description.md | 0 - util/{crossgcc => crossgcc_orig}/edk2tools.txt | 0 - util/{crossgcc => crossgcc_orig}/getopt.c | 0 - .../patches/acpica-unix-20251212_iasl.patch | 0 - .../patches/binutils-2.46.1_as-ipxe.patch | 0 - .../patches/binutils-2.46.1_no-makeinfo.patch | 0 - .../patches/gcc-15.2.0_asan_shadow_offset_callback.patch | 0 - util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_gnat.patch | 0 - .../{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libcody.patch | 0 - util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libcpp.patch | 0 - util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libgcc.patch | 0 - .../patches/gcc-15.2.0_musl_poisoned_calloc.patch | 0 - .../patches/gcc-15.2.0_rv32iafc.patch | 0 - .../patches/gmp-6.3.0_fix-c23-prototypes.patch | 0 - .../patches/gmp-6.3.0_generic-build.patch | 0 - ...rc_clang-add-x86_64-baremetal-triple-include-search-pat.patch | 0 - .../sum/acpica-unix-20251212.tar.gz.cksum | 0 - .../{crossgcc => crossgcc_orig}/sum/binutils-2.46.1.tar.xz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/cmake-4.3.4.tar.gz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/gcc-15.2.0.tar.xz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/gmp-6.3.0.tar.xz.cksum | 0 - .../sum/llvm-project-22.1.8.src.tar.xz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/mpc-1.4.1.tar.xz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/mpfr-4.2.2.tar.xz.cksum | 0 - util/{crossgcc => crossgcc_orig}/sum/nasm-3.02.tar.bz2.cksum | 0 - 32 files changed, 1 insertion(+) - create mode 120000 util/crossgcc - delete mode 100644 util/crossgcc/tarballs/.empty - rename util/{crossgcc => crossgcc_orig}/.gitignore (100%) - rename util/{crossgcc => crossgcc_orig}/Makefile (100%) - rename util/{crossgcc => crossgcc_orig}/Makefile.mk (100%) - rename util/{crossgcc => crossgcc_orig}/README (100%) - rename util/{crossgcc => crossgcc_orig}/buildgcc (100%) - rename util/{crossgcc => crossgcc_orig}/description.md (100%) - rename util/{crossgcc => crossgcc_orig}/edk2tools.txt (100%) - rename util/{crossgcc => crossgcc_orig}/getopt.c (100%) - rename util/{crossgcc => crossgcc_orig}/patches/acpica-unix-20251212_iasl.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/binutils-2.46.1_as-ipxe.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/binutils-2.46.1_no-makeinfo.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_asan_shadow_offset_callback.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_gnat.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libcody.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libcpp.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_libgcc.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_musl_poisoned_calloc.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gcc-15.2.0_rv32iafc.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gmp-6.3.0_fix-c23-prototypes.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/gmp-6.3.0_generic-build.patch (100%) - rename util/{crossgcc => crossgcc_orig}/patches/llvm-project-22.1.8.src_clang-add-x86_64-baremetal-triple-include-search-pat.patch (100%) - rename util/{crossgcc => crossgcc_orig}/sum/acpica-unix-20251212.tar.gz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/binutils-2.46.1.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/cmake-4.3.4.tar.gz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/gcc-15.2.0.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/gmp-6.3.0.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/llvm-project-22.1.8.src.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/mpc-1.4.1.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/mpfr-4.2.2.tar.xz.cksum (100%) - rename util/{crossgcc => crossgcc_orig}/sum/nasm-3.02.tar.bz2.cksum (100%) - -diff --git a/util/crossgcc b/util/crossgcc -new file mode 120000 -index 0000000000..9a648d35f7 ---- /dev/null -+++ b/util/crossgcc -@@ -0,0 +1 @@ -+../../../coreboot/default/util/crossgcc/ -\ No newline at end of file -diff --git a/util/crossgcc/tarballs/.empty b/util/crossgcc/tarballs/.empty -deleted file mode 100644 -index e69de29bb2..0000000000 -diff --git a/util/crossgcc/.gitignore b/util/crossgcc_orig/.gitignore -similarity index 100% -rename from util/crossgcc/.gitignore -rename to util/crossgcc_orig/.gitignore -diff --git a/util/crossgcc/Makefile b/util/crossgcc_orig/Makefile -similarity index 100% -rename from util/crossgcc/Makefile -rename to util/crossgcc_orig/Makefile -diff --git a/util/crossgcc/Makefile.mk b/util/crossgcc_orig/Makefile.mk -similarity index 100% -rename from util/crossgcc/Makefile.mk -rename to util/crossgcc_orig/Makefile.mk -diff --git a/util/crossgcc/README b/util/crossgcc_orig/README -similarity index 100% -rename from util/crossgcc/README -rename to util/crossgcc_orig/README -diff --git a/util/crossgcc/buildgcc b/util/crossgcc_orig/buildgcc -similarity index 100% -rename from util/crossgcc/buildgcc -rename to util/crossgcc_orig/buildgcc -diff --git a/util/crossgcc/description.md b/util/crossgcc_orig/description.md -similarity index 100% -rename from util/crossgcc/description.md -rename to util/crossgcc_orig/description.md -diff --git a/util/crossgcc/edk2tools.txt b/util/crossgcc_orig/edk2tools.txt -similarity index 100% -rename from util/crossgcc/edk2tools.txt -rename to util/crossgcc_orig/edk2tools.txt -diff --git a/util/crossgcc/getopt.c b/util/crossgcc_orig/getopt.c -similarity index 100% -rename from util/crossgcc/getopt.c -rename to util/crossgcc_orig/getopt.c -diff --git a/util/crossgcc/patches/acpica-unix-20251212_iasl.patch b/util/crossgcc_orig/patches/acpica-unix-20251212_iasl.patch -similarity index 100% -rename from util/crossgcc/patches/acpica-unix-20251212_iasl.patch -rename to util/crossgcc_orig/patches/acpica-unix-20251212_iasl.patch -diff --git a/util/crossgcc/patches/binutils-2.46.1_as-ipxe.patch b/util/crossgcc_orig/patches/binutils-2.46.1_as-ipxe.patch -similarity index 100% -rename from util/crossgcc/patches/binutils-2.46.1_as-ipxe.patch -rename to util/crossgcc_orig/patches/binutils-2.46.1_as-ipxe.patch -diff --git a/util/crossgcc/patches/binutils-2.46.1_no-makeinfo.patch b/util/crossgcc_orig/patches/binutils-2.46.1_no-makeinfo.patch -similarity index 100% -rename from util/crossgcc/patches/binutils-2.46.1_no-makeinfo.patch -rename to util/crossgcc_orig/patches/binutils-2.46.1_no-makeinfo.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_asan_shadow_offset_callback.patch b/util/crossgcc_orig/patches/gcc-15.2.0_asan_shadow_offset_callback.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_asan_shadow_offset_callback.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_asan_shadow_offset_callback.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_gnat.patch b/util/crossgcc_orig/patches/gcc-15.2.0_gnat.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_gnat.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_gnat.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_libcody.patch b/util/crossgcc_orig/patches/gcc-15.2.0_libcody.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_libcody.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_libcody.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_libcpp.patch b/util/crossgcc_orig/patches/gcc-15.2.0_libcpp.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_libcpp.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_libcpp.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_libgcc.patch b/util/crossgcc_orig/patches/gcc-15.2.0_libgcc.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_libgcc.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_libgcc.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_musl_poisoned_calloc.patch b/util/crossgcc_orig/patches/gcc-15.2.0_musl_poisoned_calloc.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_musl_poisoned_calloc.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_musl_poisoned_calloc.patch -diff --git a/util/crossgcc/patches/gcc-15.2.0_rv32iafc.patch b/util/crossgcc_orig/patches/gcc-15.2.0_rv32iafc.patch -similarity index 100% -rename from util/crossgcc/patches/gcc-15.2.0_rv32iafc.patch -rename to util/crossgcc_orig/patches/gcc-15.2.0_rv32iafc.patch -diff --git a/util/crossgcc/patches/gmp-6.3.0_fix-c23-prototypes.patch b/util/crossgcc_orig/patches/gmp-6.3.0_fix-c23-prototypes.patch -similarity index 100% -rename from util/crossgcc/patches/gmp-6.3.0_fix-c23-prototypes.patch -rename to util/crossgcc_orig/patches/gmp-6.3.0_fix-c23-prototypes.patch -diff --git a/util/crossgcc/patches/gmp-6.3.0_generic-build.patch b/util/crossgcc_orig/patches/gmp-6.3.0_generic-build.patch -similarity index 100% -rename from util/crossgcc/patches/gmp-6.3.0_generic-build.patch -rename to util/crossgcc_orig/patches/gmp-6.3.0_generic-build.patch -diff --git a/util/crossgcc/patches/llvm-project-22.1.8.src_clang-add-x86_64-baremetal-triple-include-search-pat.patch b/util/crossgcc_orig/patches/llvm-project-22.1.8.src_clang-add-x86_64-baremetal-triple-include-search-pat.patch -similarity index 100% -rename from util/crossgcc/patches/llvm-project-22.1.8.src_clang-add-x86_64-baremetal-triple-include-search-pat.patch -rename to util/crossgcc_orig/patches/llvm-project-22.1.8.src_clang-add-x86_64-baremetal-triple-include-search-pat.patch -diff --git a/util/crossgcc/sum/acpica-unix-20251212.tar.gz.cksum b/util/crossgcc_orig/sum/acpica-unix-20251212.tar.gz.cksum -similarity index 100% -rename from util/crossgcc/sum/acpica-unix-20251212.tar.gz.cksum -rename to util/crossgcc_orig/sum/acpica-unix-20251212.tar.gz.cksum -diff --git a/util/crossgcc/sum/binutils-2.46.1.tar.xz.cksum b/util/crossgcc_orig/sum/binutils-2.46.1.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/binutils-2.46.1.tar.xz.cksum -rename to util/crossgcc_orig/sum/binutils-2.46.1.tar.xz.cksum -diff --git a/util/crossgcc/sum/cmake-4.3.4.tar.gz.cksum b/util/crossgcc_orig/sum/cmake-4.3.4.tar.gz.cksum -similarity index 100% -rename from util/crossgcc/sum/cmake-4.3.4.tar.gz.cksum -rename to util/crossgcc_orig/sum/cmake-4.3.4.tar.gz.cksum -diff --git a/util/crossgcc/sum/gcc-15.2.0.tar.xz.cksum b/util/crossgcc_orig/sum/gcc-15.2.0.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/gcc-15.2.0.tar.xz.cksum -rename to util/crossgcc_orig/sum/gcc-15.2.0.tar.xz.cksum -diff --git a/util/crossgcc/sum/gmp-6.3.0.tar.xz.cksum b/util/crossgcc_orig/sum/gmp-6.3.0.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/gmp-6.3.0.tar.xz.cksum -rename to util/crossgcc_orig/sum/gmp-6.3.0.tar.xz.cksum -diff --git a/util/crossgcc/sum/llvm-project-22.1.8.src.tar.xz.cksum b/util/crossgcc_orig/sum/llvm-project-22.1.8.src.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/llvm-project-22.1.8.src.tar.xz.cksum -rename to util/crossgcc_orig/sum/llvm-project-22.1.8.src.tar.xz.cksum -diff --git a/util/crossgcc/sum/mpc-1.4.1.tar.xz.cksum b/util/crossgcc_orig/sum/mpc-1.4.1.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/mpc-1.4.1.tar.xz.cksum -rename to util/crossgcc_orig/sum/mpc-1.4.1.tar.xz.cksum -diff --git a/util/crossgcc/sum/mpfr-4.2.2.tar.xz.cksum b/util/crossgcc_orig/sum/mpfr-4.2.2.tar.xz.cksum -similarity index 100% -rename from util/crossgcc/sum/mpfr-4.2.2.tar.xz.cksum -rename to util/crossgcc_orig/sum/mpfr-4.2.2.tar.xz.cksum -diff --git a/util/crossgcc/sum/nasm-3.02.tar.bz2.cksum b/util/crossgcc_orig/sum/nasm-3.02.tar.bz2.cksum -similarity index 100% -rename from util/crossgcc/sum/nasm-3.02.tar.bz2.cksum -rename to util/crossgcc_orig/sum/nasm-3.02.tar.bz2.cksum --- -2.47.3 - diff --git a/config/module/edk2/default/patches/0053-use-std-gnu2x.patch b/config/module/edk2/default/patches/0053-use-std-gnu2x.patch deleted file mode 100644 index a1e437b8..00000000 --- a/config/module/edk2/default/patches/0053-use-std-gnu2x.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 47a2305433ea6b123ef6baf65f496b4583e198da Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 13:00:09 +0100 -Subject: [PATCH 53/56] use -std=gnu2x -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -equiv to gnu23 in practise, and fixes a build error -for a user who reported: - -cc: error: unrecognized command-line option ‘-std=gnu23’; did you mean ‘-std=gnu2x’? - -when building coreboot utils - -gnu2x is gnu23 in practise, on both gcc and clang. -we can just use this, and it won't break systems -that worked. - -the user did not say what compiler and compiler version -they were using (cbutils are built using hostcc in lbmk) - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - Makefile.mk | 2 +- - payloads/libpayload/Makefile | 2 +- - tests/Makefile.common | 2 +- - util/amdfwtool/Makefile.mk | 2 +- - util/cbfstool/Makefile.mk | 2 +- - util/cbmem/Makefile | 2 +- - util/ifdtool/Makefile.mk | 2 +- - util/sconfig/Makefile.mk | 2 +- - util/supermicro/Makefile.mk | 2 +- - 13 files changed, 599 insertions(+), 9 deletions(-) - -diff --git a/Makefile.mk b/Makefile.mk -index 2c39d3d632..12e2368a8f 100644 ---- a/Makefile.mk -+++ b/Makefile.mk -@@ -530,7 +530,7 @@ endif - CFLAGS_common += -pipe - CFLAGS_common += -g - CFLAGS_common += -nostdinc --CFLAGS_common += -std=gnu23 -+CFLAGS_common += -std=gnu2x - CFLAGS_common += -nostdlib - CFLAGS_common += -Wall - CFLAGS_common += -Wundef -diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile -index 29c3fb199f..bb7c6f600f 100644 ---- a/payloads/libpayload/Makefile -+++ b/payloads/libpayload/Makefile -@@ -218,7 +218,7 @@ STRIP := $(STRIP_$(ARCH-y)) - AR := $(AR_$(ARCH-y)) - endif - --CFLAGS += -std=gnu23 $(CFLAGS_$(ARCH-y)) -+CFLAGS += -std=gnu2x $(CFLAGS_$(ARCH-y)) - - ifeq ($(CONFIG_LP_COMPILER_LLVM_CLANG),y) - CC:=clang -diff --git a/tests/Makefile.common b/tests/Makefile.common -index c35e312a79..5c6f8ff798 100644 ---- a/tests/Makefile.common -+++ b/tests/Makefile.common -@@ -51,7 +51,7 @@ TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type - TEST_CFLAGS += -Wno-array-compare -Wno-trigraphs - TEST_CFLAGS += -Wno-unused-but-set-variables - --TEST_CFLAGS += -std=gnu23 -ffunction-sections -fdata-sections -fno-builtin -+TEST_CFLAGS += -std=gnu2x -ffunction-sections -fdata-sections -fno-builtin - - ifneq ($(filter-out 0,$(DEBUG)),) - TEST_CFLAGS += -Og -ggdb3 -diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk -index f7dce01b71..ac09d083cf 100644 ---- a/util/amdfwtool/Makefile.mk -+++ b/util/amdfwtool/Makefile.mk -@@ -11,7 +11,7 @@ AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow $(WERROR) - AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include - AMDFWTOOLCFLAGS += -I $(top)/src/ - AMDFWTOOLCFLAGS += -D_GNU_SOURCE # memmem() from string.h --AMDFWTOOLCFLAGS += -std=gnu23 -+AMDFWTOOLCFLAGS += -std=gnu2x - AMDFWTOOLCFLAGS += -ffunction-sections -fdata-sections - - ifneq ($(PKG_CONFIG),) -diff --git a/util/cbfstool/Makefile.mk b/util/cbfstool/Makefile.mk -index d195e4713a..75e8f1797f 100644 ---- a/util/cbfstool/Makefile.mk -+++ b/util/cbfstool/Makefile.mk -@@ -175,7 +175,7 @@ HOSTCFLAGS += -fms-extensions - TOOLCFLAGS += -mno-ms-bitfields - endif - ifeq ($(shell uname -o 2>/dev/null), Cygwin) --TOOLCFLAGS+=-std=gnu23 -+TOOLCFLAGS+=-std=gnu2x - TOOLCPPFLAGS+=-D_GNU_SOURCE - else - TOOLCFLAGS+=-std=c11 -diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile -index fe2891be6d..bb305cee77 100644 ---- a/util/cbmem/Makefile -+++ b/util/cbmem/Makefile -@@ -11,7 +11,7 @@ PREFIX ?= /usr/local - CFLAGS ?= -O2 - WERROR= - CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wshadow $(WERROR) --CFLAGS += -std=gnu23 -+CFLAGS += -std=gnu2x - CPPFLAGS += -I . -I $(ROOT)/commonlib/include -I $(ROOT)/commonlib/bsd/include - CPPFLAGS += -include $(ROOT)/commonlib/bsd/include/commonlib/bsd/compiler.h - -diff --git a/util/ifdtool/Makefile.mk b/util/ifdtool/Makefile.mk -index 57d192ccb8..58bec4739c 100644 ---- a/util/ifdtool/Makefile.mk -+++ b/util/ifdtool/Makefile.mk -@@ -7,7 +7,7 @@ IFDTOOLCFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/inclu - IFDTOOLCFLAGS += -I$(top)/util/cbfstool/flashmap - IFDTOOLCFLAGS += -include $(top)/src/commonlib/bsd/include/commonlib/bsd/compiler.h - IFDTOOLCFLAGS += -D_DEFAULT_SOURCE # for endianness converting functions --IFDTOOLCFLAGS += -std=gnu23 -+IFDTOOLCFLAGS += -std=gnu2x - - $(objutil)/ifdtool/%.o: $(top)/util/ifdtool/%.c - $(HOSTCC) $(IFDTOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< -diff --git a/util/sconfig/Makefile.mk b/util/sconfig/Makefile.mk -index 9dcf5b5c71..cda1d81223 100644 ---- a/util/sconfig/Makefile.mk -+++ b/util/sconfig/Makefile.mk -@@ -6,7 +6,7 @@ sconfigobj += main.o - - SCONFIGFLAGS += -I$(top)/util/sconfig -I$(objutil)/sconfig - SCONFIGFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include --SCONFIGFLAGS += -std=gnu23 -+SCONFIGFLAGS += -std=gnu2x - - $(objutil)/sconfig: - mkdir -p $@ -diff --git a/util/supermicro/Makefile.mk b/util/supermicro/Makefile.mk -index f627b854bd..f5e0d7012c 100644 ---- a/util/supermicro/Makefile.mk -+++ b/util/supermicro/Makefile.mk -@@ -6,7 +6,7 @@ SMCBIOSINFOTOOL:= $(objutil)/supermicro/smcbiosinfo - $(SMCBIOSINFOTOOL): $(dir)/smcbiosinfo/smcbiosinfo.c - printf " HOSTCC Creating SMCBIOSINFO tool\n" - mkdir -p $(objutil)/supermicro -- $(HOSTCC) -std=gnu23 $(TOOLCPPFLAGS) $< -o $@ -+ $(HOSTCC) -std=gnu2x $(TOOLCPPFLAGS) $< -o $@ - - ifeq ($(CONFIG_VENDOR_SUPERMICRO),y) - ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),) - --- -2.47.3 - diff --git a/config/module/edk2/default/target.cfg b/config/module/edk2/default/target.cfg deleted file mode 100644 index 0fcde42a..00000000 --- a/config/module/edk2/default/target.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -# can be overridden per-tree e.g. use mrchromebox -url="https://github.com/coreboot/coreboot.git" -bkup_url="https://review.coreboot.org/coreboot" - -makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" - -rev="8ce4c91c41da3f042979f92095149a85bc93227d" - -# edk2 in lbmk is actually coreboot, but with a fake board config -# that turns on edk2. coreboot is patched to never delete tianocore -# source code. - -# however, it is also patched not to download tianocore. we download -# it, using libreboot's submodules feature! for redundancy, and patching - -# this is a lazy way to do edk2 without integrating it into lbmk, which -# would bloat lbmk. coreboot already does all the magic, and matt maintains -# it. why reinvent matt's perfect wheel? - -# it costs about half a minute extra, to build one coreboot target, -# and then the build is used in bulk across boards. this is the leah -# way to do tianocore in your coreboot distribution. - -# yes. - -xarch="i386-elf" # hack. for building the fake coreboot target -# not a performance hurdle on releases, since we will also use -# that coreboot target, and thus we will use crossgcc there - -tree="default" - -# we will build crossgcc in here, -# with ours symlinking to it -fetch_depend="coreboot/default" - -# not stable yet for lbmk releases. -# tianocore payloads will be disabled -# in coreboot targets that use them, -# and coreboot targets that only use -# edk2 will have release=n as well -release="n" diff --git a/config/module/edk2/mrchromebox/config/libgfxinit_corebootfb b/config/module/edk2/mrchromebox/config/libgfxinit_corebootfb deleted file mode 100644 index eb36b6e4..00000000 --- a/config/module/edk2/mrchromebox/config/libgfxinit_corebootfb +++ /dev/null @@ -1,955 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# coreboot configuration -# - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_CBFS_PREFIX="fallback" -CONFIG_COMPILER_GCC=y -# CONFIG_COMPILER_LLVM_CLANG is not set -# CONFIG_ANY_TOOLCHAIN is not set -# CONFIG_CCACHE is not set -# CONFIG_LTO is not set -# CONFIG_IWYU is not set -# CONFIG_FMD_GENPARSER is not set -# CONFIG_UTIL_GENPARSER is not set -# CONFIG_OPTION_BACKEND_NONE is not set -CONFIG_USE_CBFS_FILE_OPTION_BACKEND=y -CONFIG_COMPRESS_RAMSTAGE_LZMA=y -# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set -# CONFIG_COMPRESS_RAMSTAGE_ZSTD is not set -CONFIG_SEPARATE_ROMSTAGE=y -CONFIG_INCLUDE_CONFIG_FILE=y -CONFIG_COLLECT_TIMESTAMPS=y -# CONFIG_TIMESTAMPS_ON_CONSOLE is not set -CONFIG_USE_BLOBS=y -# CONFIG_USE_AMD_BLOBS is not set -# CONFIG_USE_QC_BLOBS is not set -# CONFIG_COVERAGE is not set -# CONFIG_UBSAN is not set -CONFIG_HAVE_ASAN_IN_RAMSTAGE=y -# CONFIG_ASAN is not set -# CONFIG_NO_STAGE_CACHE is not set -CONFIG_TSEG_STAGE_CACHE=y -# CONFIG_UPDATE_IMAGE is not set -# CONFIG_BOOTSPLASH_IMAGE is not set - -# -# Software Bill Of Materials (SBOM) -# -# CONFIG_SBOM is not set -# end of Software Bill Of Materials (SBOM) -# end of General setup - -# -# Mainboard -# - -# -# Important: Run 'make distclean' before switching boards -# -# CONFIG_VENDOR_51NB is not set -# CONFIG_VENDOR_ACER is not set -# CONFIG_VENDOR_AMD is not set -# CONFIG_VENDOR_AOOSTAR is not set -# CONFIG_VENDOR_AOPEN is not set -# CONFIG_VENDOR_APPLE is not set -# CONFIG_VENDOR_ARM is not set -# CONFIG_VENDOR_ASROCK is not set -# CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_BIOSTAR is not set -# CONFIG_VENDOR_BOSTENTECH is not set -# CONFIG_VENDOR_BYTEDANCE is not set -# CONFIG_VENDOR_CAVIUM is not set -# CONFIG_VENDOR_CLEVO is not set -# CONFIG_VENDOR_COMPULAB is not set -# CONFIG_VENDOR_CWWK is not set -# CONFIG_VENDOR_DELL is not set -# CONFIG_VENDOR_EMULATION is not set -# CONFIG_VENDOR_ERYING is not set -# CONFIG_VENDOR_EXAMPLE is not set -# CONFIG_VENDOR_FACEBOOK is not set -# CONFIG_VENDOR_FOXCONN is not set -# CONFIG_VENDOR_FRAMEWORK is not set -# CONFIG_VENDOR_GETAC is not set -# CONFIG_VENDOR_GIGABYTE is not set -# CONFIG_VENDOR_GOOGLE is not set -# CONFIG_VENDOR_HARDKERNEL is not set -# CONFIG_VENDOR_HP is not set -# CONFIG_VENDOR_IBASE is not set -# CONFIG_VENDOR_IBM is not set -# CONFIG_VENDOR_INTEL is not set -# CONFIG_VENDOR_INVENTEC is not set -# CONFIG_VENDOR_KONTRON is not set -# CONFIG_VENDOR_LATTEPANDA is not set -CONFIG_VENDOR_LENOVO=y -# CONFIG_VENDOR_LIBRETREND is not set -# CONFIG_VENDOR_MITAC_COMPUTING is not set -# CONFIG_VENDOR_MSI is not set -# CONFIG_VENDOR_NOVACUSTOM is not set -# CONFIG_VENDOR_NVIDIA is not set -# CONFIG_VENDOR_OCP is not set -# CONFIG_VENDOR_OPENCELLULAR is not set -# CONFIG_VENDOR_PACKARDBELL is not set -# CONFIG_VENDOR_PCENGINES is not set -# CONFIG_VENDOR_PINE64 is not set -# CONFIG_VENDOR_PORTWELL is not set -# CONFIG_VENDOR_PRODRIVE is not set -# CONFIG_VENDOR_PROTECTLI is not set -# CONFIG_VENDOR_PURISM is not set -# CONFIG_VENDOR_QOTOM is not set -# CONFIG_VENDOR_RAPTOR_CS is not set -# CONFIG_VENDOR_RAZER is not set -# CONFIG_VENDOR_RODA is not set -# CONFIG_VENDOR_SAMSUNG is not set -# CONFIG_VENDOR_SAPPHIRE is not set -# CONFIG_VENDOR_SIEMENS is not set -# CONFIG_VENDOR_SIFIVE is not set -# CONFIG_VENDOR_STARLABS is not set -# CONFIG_VENDOR_SUPERMICRO is not set -# CONFIG_VENDOR_SYSTEM76 is not set -# CONFIG_VENDOR_TI is not set -# CONFIG_VENDOR_TOPTON is not set -# CONFIG_VENDOR_UP is not set -# CONFIG_VENDOR_VIA is not set -CONFIG_MAINBOARD_FAMILY="T480" -CONFIG_MAINBOARD_PART_NUMBER="T480" -CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad" -CONFIG_VGA_BIOS_ID="8086,0406" -CONFIG_DIMM_MAX=2 -CONFIG_DIMM_SPD_SIZE=512 -CONFIG_FMDFILE="" -# CONFIG_NO_POST is not set -CONFIG_MAINBOARD_VENDOR="LENOVO" -CONFIG_CBFS_SIZE=0xEEC000 -CONFIG_CONSOLE_SERIAL=y -CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600 -CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560 -CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_DUAL=y -CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_QUAD=y -CONFIG_MAX_CPUS=8 -# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set -CONFIG_POST_DEVICE=y -CONFIG_POST_IO=y -CONFIG_UART_FOR_CONSOLE=0 -CONFIG_VARIANT_DIR="t480" -CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" -CONFIG_DEVICETREE="devicetree.cb" -# CONFIG_VBOOT is not set -# CONFIG_VGA_BIOS is not set -CONFIG_PCIEXP_ASPM=y -CONFIG_PCIEXP_L1_SUB_STATE=y -CONFIG_PCIEXP_CLK_PM=y -CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" -CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000 -CONFIG_ECAM_MMCONF_BUS_NUMBER=256 -CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" -# CONFIG_FATAL_ASSERTS is not set -# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set -CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 -CONFIG_TPM_PIRQ=0x0 -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T480" -# CONFIG_CONSOLE_POST is not set -CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd" -CONFIG_MAX_SOCKET=1 -CONFIG_USE_PM_ACPI_TIMER=y -CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 -CONFIG_DCACHE_RAM_BASE=0xfef00000 -CONFIG_DCACHE_RAM_SIZE=0x40000 -CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000 -CONFIG_DCACHE_BSP_STACK_SIZE=0x4000 -CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 -CONFIG_HAVE_INTEL_FIRMWARE=y -CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 -CONFIG_DRIVERS_INTEL_WIFI=y -CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y -CONFIG_D3COLD_SUPPORT=y -CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 -CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO" -CONFIG_EDK2_BOOT_TIMEOUT=2 -# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set -CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y -CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y -CONFIG_USE_LEGACY_8254_TIMER=y -# CONFIG_DEBUG_SMI is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set -# CONFIG_HAVE_IFD_BIN is not set -# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set -# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set -# CONFIG_BOARD_LENOVO_L520 is not set -# CONFIG_BOARD_LENOVO_M720Q is not set -# CONFIG_BOARD_LENOVO_M920Q is not set -# CONFIG_BOARD_LENOVO_M900 is not set -# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set -# CONFIG_BOARD_LENOVO_P320 is not set -# CONFIG_BOARD_LENOVO_S230U is not set -# CONFIG_BOARD_LENOVO_T470S is not set -CONFIG_BOARD_LENOVO_T480=y -# CONFIG_BOARD_LENOVO_T480S is not set -# CONFIG_BOARD_LENOVO_T580 is not set -# CONFIG_BOARD_LENOVO_X280 is not set -# CONFIG_BOARD_LENOVO_X380_YOGA is not set -# CONFIG_BOARD_LENOVO_T400 is not set -# CONFIG_BOARD_LENOVO_T500 is not set -# CONFIG_BOARD_LENOVO_R400 is not set -# CONFIG_BOARD_LENOVO_R500 is not set -# CONFIG_BOARD_LENOVO_W500 is not set -# CONFIG_BOARD_LENOVO_T410 is not set -# CONFIG_BOARD_LENOVO_T420 is not set -# CONFIG_BOARD_LENOVO_T420S is not set -# CONFIG_BOARD_LENOVO_T430S is not set -# CONFIG_BOARD_LENOVO_T431S is not set -# CONFIG_BOARD_LENOVO_T520 is not set -# CONFIG_BOARD_LENOVO_W520 is not set -# CONFIG_BOARD_LENOVO_T530 is not set -# CONFIG_BOARD_LENOVO_W530 is not set -# CONFIG_BOARD_LENOVO_T430 is not set -# CONFIG_BOARD_LENOVO_T60 is not set -# CONFIG_BOARD_LENOVO_Z61T is not set -# CONFIG_BOARD_LENOVO_R60 is not set -# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set -# CONFIG_BOARD_LENOVO_THINKCENTRE_M710S is not set -# CONFIG_BOARD_LENOVO_X131E is not set -# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set -# CONFIG_BOARD_LENOVO_X200 is not set -# CONFIG_BOARD_LENOVO_X301 is not set -# CONFIG_BOARD_LENOVO_X201 is not set -# CONFIG_BOARD_LENOVO_X220 is not set -# CONFIG_BOARD_LENOVO_X220I is not set -# CONFIG_BOARD_LENOVO_X1 is not set -# CONFIG_BOARD_LENOVO_X230 is not set -# CONFIG_BOARD_LENOVO_X230T is not set -# CONFIG_BOARD_LENOVO_X230S is not set -# CONFIG_BOARD_LENOVO_X230_EDP is not set -# CONFIG_BOARD_LENOVO_X60 is not set -# CONFIG_BOARD_LENOVO_X61 is not set -CONFIG_PS2K_EISAID="LEN0071" -CONFIG_PS2M_EISAID="LEN0094" -CONFIG_THINKPADEC_HKEY_EISAID="LEN0268" -CONFIG_GFX_GMA_PANEL_1_PORT="eDP" -CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON=y -CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y -CONFIG_EDK2_FOLLOW_BGRT_SPEC=y -# CONFIG_EDK2_FULL_SCREEN_SETUP is not set -CONFIG_MEC1653_DEBUG_UNLOCK_KEY="7a41b149fe2101cf" -CONFIG_VARIANT_HAS_DGPU=y -CONFIG_TTYS0_BAUD=115200 -# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set -CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y -CONFIG_GFX_GMA_PANEL_1_ON_EDP=y -CONFIG_DRIVERS_UART_8250IO=y -CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 -CONFIG_HEAP_SIZE=0x100000 -CONFIG_EDK2_BOOTSPLASH_FILE="Documentation/coreboot_logo.bmp" -# CONFIG_BOOTMEDIA_SMM_BWP is not set -# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set -CONFIG_USE_PC_CMOS_ALTCENTURY=y -# CONFIG_DRIVERS_EFI_FW_INFO is not set -# CONFIG_TCG_OPAL_S3_UNLOCK is not set -CONFIG_BOARD_ROMSIZE_KB_16384=y -# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set -CONFIG_COREBOOT_ROMSIZE_KB_16384=y -# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set -CONFIG_COREBOOT_ROMSIZE_KB=16384 -CONFIG_ROM_SIZE=0x01000000 -CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y -CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y -# CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set -CONFIG_POWER_STATE_ON_AFTER_FAILURE=y -# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set -CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 -# end of Mainboard - -CONFIG_SYSTEM_TYPE_LAPTOP=y - -# -# Chipset -# - -# -# SoC -# -CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb" -CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/" -CONFIG_CBFS_MCACHE_SIZE=0x4000 -CONFIG_ROMSTAGE_ADDR=0x2000000 -CONFIG_VERSTAGE_ADDR=0x2000000 -CONFIG_SMM_TSEG_SIZE=0x800000 -CONFIG_SMM_RESERVED_SIZE=0x200000 -CONFIG_SMM_MODULE_STACK_SIZE=0x800 -CONFIG_ACPI_BERT_SIZE=0x0 -CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120 -CONFIG_CPU_PT_ROM_MAP_GB=512 -CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 -CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000 -CONFIG_ACPI_CPU_STRING="CP%02X" -CONFIG_STACK_SIZE=0x2000 -CONFIG_IFD_CHIPSET="sklkbl" -CONFIG_IED_REGION_SIZE=0x400000 -CONFIG_MAX_ROOT_PORTS=24 -CONFIG_PCR_BASE_ADDRESS=0xfd000000 -CONFIG_CPU_BCLK_MHZ=100 -CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120 -CONFIG_CPU_XTAL_HZ=24000000 -CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=2 -CONFIG_SOC_INTEL_I2C_DEV_MAX=6 -# CONFIG_ENABLE_SATA_TEST_MODE is not set -CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30 -CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35 -CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0 -CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254 -CONFIG_INTEL_GMA_BCLV_WIDTH=16 -CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 -CONFIG_INTEL_GMA_BCLM_WIDTH=16 -CONFIG_FSP_PUBLISH_MBP_HOB=y -CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003 -CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y -CONFIG_MAX_HECI_DEVICES=5 -CONFIG_BOOTBLOCK_IN_CBFS=y -CONFIG_HAVE_PAM0_REGISTER=y -CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000 -CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10 -CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0 -CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003 -CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003 -CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0 -CONFIG_DEBUG_STACK_OVERFLOW_BREAKPOINTS=y -CONFIG_CBFS_CACHE_ALIGN=8 -CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y -CONFIG_SOC_INTEL_KABYLAKE=y -# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set -CONFIG_FSP_T_LOCATION=0xfffe0000 -CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y -CONFIG_FIXED_SMBUS_IO_BASE=0xefa0 -CONFIG_UART_BITBANG_TX_DELAY_MS=5 -CONFIG_SOC_INTEL_COMMON=y - -# -# Intel SoC Common Code for IP blocks -# -CONFIG_SOC_INTEL_COMMON_BLOCK=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_GPIO=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_LPIT=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_PEP=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_CPPC=y -CONFIG_SOC_INTEL_COMMON_BLOCK_CHIP_CONFIG=y -CONFIG_SOC_INTEL_COMMON_BLOCK_CPU=y -CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT=y -CONFIG_USE_FSP_FEATURE_PROGRAM_ON_APS=y -# CONFIG_USE_COREBOOT_MP_INIT is not set -CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y -CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y -CONFIG_INTEL_CAR_NEM_ENHANCED=y -# CONFIG_USE_INTEL_FSP_MP_INIT is not set -CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y -CONFIG_HAVE_HYPERTHREADING=y -# CONFIG_FSP_HYPERTHREADING is not set -# CONFIG_INTEL_KEYLOCKER is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_MAX is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_256MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_128MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_64MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_32MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_16MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_8MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_4MB is not set -# CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_2MB is not set -CONFIG_SOC_INTEL_COMMON_BLOCK_PRMRR_SIZE_0MB=y -CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y -CONFIG_SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PCR=y -CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME" -CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw" -CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version" -CONFIG_SOC_INTEL_CSE_RW_FILE="" -CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE="" -CONFIG_SOC_INTEL_CSE_RW_VERSION="" -CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom" -CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE="" -CONFIG_SOC_INTEL_CSE_NPHY_CBFS_NAME="cse_nphy" -CONFIG_SOC_INTEL_CSE_NPHY_CBFS_FILE="" -CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y -CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y -CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GPMR=y -CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y -CONFIG_SOC_INTEL_GFX_HAVE_DDI_A_BIFURCATION=y -# CONFIG_SOC_INTEL_DISABLE_IGD is not set -CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y -CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y -CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB=y -CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y -CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y -CONFIG_SOC_INTEL_COMMON_BLOCK_LPC_MIRROR_TO_GPMR=y -CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_BASE_P2SB=y -CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y -CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y -CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y -CONFIG_SOC_INTEL_COMMON_BLOCK_PMC_DISCOVERABLE=y -CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y -CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y -CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SGX=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y -CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y -# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set -CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0 -CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y -CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y -CONFIG_SA_ENABLE_DPR=y -CONFIG_HAVE_CAPID_A_REGISTER=y -CONFIG_HAVE_BDSM_BGSM_REGISTER=y -CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y -CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y -CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y -CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y -CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y -CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y -CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y - -# -# Intel SoC Common Code for features -# -CONFIG_SOC_INTEL_COMMON_FEATURE=y -CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y -CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y -CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y - -# -# Intel SoC Common PCH Code -# -CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y -CONFIG_SOC_INTEL_COMMON_PCH_BASE=y -CONFIG_SOC_INTEL_COMMON_PCH_LOCKDOWN=y -CONFIG_PCH_SPECIFIC_BASE_OPTIONS=y -CONFIG_PCH_SPECIFIC_DISCRETE_OPTIONS=y -CONFIG_PCH_SPECIFIC_CLIENT_OPTIONS=y - -# -# Intel SoC Common coreboot stages and non-IP blocks -# -CONFIG_SOC_INTEL_COMMON_BASECODE=y -CONFIG_SOC_INTEL_COMMON_RESET=y -CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y -CONFIG_PAVP=y -# CONFIG_MMA is not set -CONFIG_SOC_INTEL_COMMON_NHLT=y -# CONFIG_SOC_INTEL_DEBUG_CONSENT is not set - -# -# CPU -# -CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y -CONFIG_CPU_INTEL_COMMON=y -CONFIG_ENABLE_VMX=y -CONFIG_SET_IA32_FC_LOCK_BIT=y -CONFIG_SET_MSR_AESNI_LOCK_BIT=y -CONFIG_CPU_INTEL_COMMON_SMM=y -CONFIG_PARALLEL_MP=y -CONFIG_PARALLEL_MP_AP_WORK=y -CONFIG_XAPIC_ONLY=y -# CONFIG_X2APIC_ONLY is not set -# CONFIG_X2APIC_RUNTIME is not set -# CONFIG_X2APIC_LATE_WORKAROUND is not set -CONFIG_UDELAY_TSC=y -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 -CONFIG_SSE=y -CONFIG_SSE2=y -CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y -CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y -CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y -# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set -# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set -# CONFIG_CPU_MICROCODE_CBFS_NONE is not set - -# -# Northbridge -# - -# -# Southbridge -# -# CONFIG_PCIEXP_HOTPLUG is not set -CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y -CONFIG_PCIEXP_COMMON_CLOCK=y -CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y -CONFIG_HAVE_INSMM_STS=y -CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y -# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set -CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000 -CONFIG_RCBA_LENGTH=0x4000 - -# -# Super I/O -# - -# -# Embedded Controllers -# -CONFIG_EC_ACPI=y -CONFIG_EC_LENOVO_H8=y -CONFIG_H8_BEEP_ON_DEATH=y -CONFIG_H8_FLASH_LEDS_ON_DEATH=y -CONFIG_H8_SUPPORT_BT_ON_WIFI=y -# CONFIG_H8_FN_CTRL_SWAP is not set -CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y -CONFIG_H8_HAS_BAT_INFO_EXTENDED=y -CONFIG_H8_HAS_PRIMARY_FN_KEYS=y -CONFIG_H8_HAS_LEDLOGO=y -CONFIG_H8_HAS_FNLOCK_LED=y -CONFIG_EC_LENOVO_MEC1653=y -CONFIG_MEC1653_HAS_DEBUG_UNLOCK=y -CONFIG_MEC1653_ENABLE_UART=y -CONFIG_EC_LENOVO_PMH7=y - -# -# Intel Firmware -# -CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y -CONFIG_ACPI_FNKEY_GEN_SCANCODE=0 -CONFIG_UDK_BASE=y -CONFIG_UDK_2017_BINDING=y -CONFIG_UDK_2013_VERSION=2013 -CONFIG_UDK_2017_VERSION=2017 -CONFIG_UDK_202005_VERSION=202005 -CONFIG_UDK_202111_VERSION=202111 -CONFIG_UDK_202302_VERSION=202302 -CONFIG_UDK_202305_VERSION=202305 -CONFIG_UDK_VERSION=2017 -CONFIG_ARCH_X86=y -CONFIG_ARCH_BOOTBLOCK_X86_32=y -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 -CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y -CONFIG_PC80_SYSTEM=y -CONFIG_POSTCAR_STAGE=y -CONFIG_BOOTBLOCK_SIMPLE=y -# CONFIG_BOOTBLOCK_NORMAL is not set -CONFIG_COLLECT_TIMESTAMPS_TSC=y -CONFIG_HAVE_CF9_RESET=y -CONFIG_DEBUG_HW_BREAKPOINTS=y -CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y -# CONFIG_DUMP_SMBIOS_TYPE17 is not set -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 -# CONFIG_ASYNC_FILE_LOADING_CACHE is not set -# end of Chipset - -# -# Devices -# -CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y -CONFIG_HAVE_LINEAR_FRAMEBUFFER=y -CONFIG_HAVE_FSP_GOP=y -CONFIG_MAINBOARD_HAS_LIBGFXINIT=y -CONFIG_MAINBOARD_USE_LIBGFXINIT=y -# CONFIG_VGA_ROM_RUN is not set -# CONFIG_RUN_FSP_GOP is not set -# CONFIG_NO_GFX_INIT is not set -CONFIG_NO_EARLY_GFX_INIT=y -CONFIG_ON_DEVICE_ROM_LOAD=y - -# -# Display -# -CONFIG_WANT_LINEAR_FRAMEBUFFER=y -# CONFIG_VGA_TEXT_FRAMEBUFFER is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_LINEAR_FRAMEBUFFER=y -# CONFIG_BOOTSPLASH is not set -CONFIG_DEFAULT_SCREEN_ROTATION_NONE=y -# CONFIG_DEFAULT_SCREEN_ROTATION_90 is not set -# CONFIG_DEFAULT_SCREEN_ROTATION_180 is not set -# CONFIG_DEFAULT_SCREEN_ROTATION_270 is not set -CONFIG_DEFAULT_SCREEN_ROTATION_INT=0 -# end of Display - -CONFIG_PCI=y -CONFIG_ECAM_MMCONF_SUPPORT=y -CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_HDA_CODEC_SUPPORT=y -CONFIG_AZALIA_USE_LEGACY_VERB_TABLE=y -CONFIG_PCIEXP_PLUGIN_SUPPORT=y -CONFIG_ECAM_MMCONF_LENGTH=0x10000000 -CONFIG_PCI_ALLOW_BUS_MASTER=y -CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y -CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y -# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set -# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set -# CONFIG_EARLY_PCI_BRIDGE is not set -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 -CONFIG_INTEL_GMA_HAVE_VBT=y -CONFIG_INTEL_GMA_ADD_VBT=y -# CONFIG_SOFTWARE_I2C is not set -CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 -CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y -CONFIG_DRAM_SUPPORT_DDR4=y -CONFIG_DRAM_SUPPORT_DDR3=y -# end of Devices - -# -# Generic Drivers -# -CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 -# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set -# CONFIG_ELOG is not set -# CONFIG_DRIVERS_HWID_DMI is not set -CONFIG_CACHE_MRC_SETTINGS=y -CONFIG_MRC_SETTINGS_PROTECT=y -# CONFIG_DRIVERS_OPTION_CFR is not set -# CONFIG_SELF_TEST is not set -# CONFIG_SMMSTORE is not set -CONFIG_SPI_FLASH=y -CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y -CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y -# CONFIG_SPI_FLASH_NO_FAST_READ is not set -CONFIG_DRIVERS_UART=y -# CONFIG_DRIVERS_UART_OXPCIE is not set -# CONFIG_VPD is not set -# CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG is not set -# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set -# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set -CONFIG_DRIVERS_I2C_DESIGNWARE=y -# CONFIG_DRIVERS_I2C_MAX98396 is not set -CONFIG_DRIVERS_INTEL_DTBT=y -# CONFIG_FSP_USE_REPO is not set -# CONFIG_DISPLAY_HOBS is not set -# CONFIG_DISPLAY_UPD_DATA is not set -CONFIG_PLATFORM_USES_FSP2_0=y -CONFIG_PLATFORM_USES_FSP2_X86_32=y -CONFIG_HAVE_INTEL_FSP_REPO=y -# CONFIG_ADD_FSP_BINARIES is not set -CONFIG_FSP_S_CBFS="fsps.bin" -CONFIG_FSP_M_CBFS="fspm.bin" -CONFIG_FSP_T_RESERVED_SIZE=0x0 -CONFIG_FSP_M_XIP=y -CONFIG_FSP_COMPRESS_FSP_S_LZ4=y -CONFIG_SOC_INTEL_COMMON_FSP_RESET=y -CONFIG_USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM=y -CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y -CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y -# CONFIG_DISPLAY_FSP_TIMESTAMPS is not set -# CONFIG_BUILDING_WITH_DEBUG_FSP is not set -CONFIG_FSP_VGA_MODE12_BPP=0x0 -CONFIG_INTEL_GMA_ACPI=y -CONFIG_VBT_CBFS_COMPRESSION_LZMA=y -# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set -# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set -CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" -CONFIG_GFX_GMA=y -CONFIG_GFX_GMA_DYN_CPU=y -CONFIG_GFX_GMA_GENERATION="Skylake" -CONFIG_GFX_GMA_PCH="Sunrise_Point" -CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" -CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" -CONFIG_DRIVERS_INTEL_OC_MAILBOX=y -# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -# CONFIG_DRIVERS_PS2_KEYBOARD is not set -CONFIG_DRIVERS_MC146818=y -CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70 -CONFIG_MEMORY_MAPPED_TPM=y -CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 -CONFIG_DRIVERS_PCIE_GENERIC=y -# CONFIG_DRIVERS_SIL_3114 is not set -CONFIG_DRIVERS_USB_ACPI=y -CONFIG_DRIVERS_WIFI_GENERIC=y -CONFIG_DRIVERS_MTK_WIFI=y -# end of Generic Drivers - -# -# Security -# - -# -# CBFS verification -# -# CONFIG_CBFS_VERIFICATION is not set -# end of CBFS verification - -# -# Verified Boot (vboot) -# -# end of Verified Boot (vboot) - -# -# Trusted Platform Module -# -CONFIG_NO_TPM=y -# CONFIG_TPM1 is not set -# CONFIG_TPM2 is not set -CONFIG_MAINBOARD_HAS_TPM2=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_FW_VER=10 -CONFIG_PCR_RUNTIME_DATA=3 -# end of Trusted Platform Module - -# -# TCG storage -# -# end of TCG storage - -# -# Memory initialization -# -CONFIG_PLATFORM_HAS_DRAM_CLEAR=y -# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set -# end of Memory initialization - -# CONFIG_STM is not set -# CONFIG_INTEL_CBNT_SUPPORT is not set -CONFIG_BOOTMEDIA_LOCK_NONE=y -# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set -# CONFIG_BOOTMEDIA_LOCK_CHIP is not set -# end of Security - -CONFIG_ACPI_HAVE_PCAT_8259=y -CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y -CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_CUSTOM_MADT=y -CONFIG_ACPI_NO_CUSTOM_MADT=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y -CONFIG_ACPI_COMMON_MADT_IOAPIC=y -CONFIG_HAVE_ACPI_TABLES=y -CONFIG_ACPI_LPIT=y -CONFIG_BOOT_DEVICE_SPI_FLASH=y -CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y -CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y -CONFIG_RTC=y - -# -# Console -# -CONFIG_BOOTBLOCK_CONSOLE=y -CONFIG_POSTCAR_CONSOLE=y -CONFIG_SQUELCH_EARLY_SMP=y - -# -# I/O mapped, 8250-compatible -# -CONFIG_TTYS0_BASE=0x3f8 - -# -# Serial port base address = 0x3f8 -# -# CONFIG_CONSOLE_SERIAL_921600 is not set -# CONFIG_CONSOLE_SERIAL_460800 is not set -# CONFIG_CONSOLE_SERIAL_230400 is not set -CONFIG_CONSOLE_SERIAL_115200=y -# CONFIG_CONSOLE_SERIAL_57600 is not set -# CONFIG_CONSOLE_SERIAL_38400 is not set -# CONFIG_CONSOLE_SERIAL_19200 is not set -# CONFIG_CONSOLE_SERIAL_9600 is not set -CONFIG_TTYS0_LCS=3 -# CONFIG_SPKMODEM is not set -# CONFIG_CONSOLE_NE2K is not set -CONFIG_CONSOLE_CBMEM=y -# CONFIG_CONSOLE_SPI_FLASH is not set -# CONFIG_CONSOLE_I2C_SMBUS is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 -CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y -CONFIG_CONSOLE_USE_ANSI_ESCAPES=y -# CONFIG_CMOS_POST is not set -CONFIG_POST_DEVICE_NONE=y -# CONFIG_POST_DEVICE_LPC is not set -# CONFIG_POST_DEVICE_PCI_PCIE is not set -CONFIG_POST_IO_PORT=0x80 -CONFIG_HWBASE_DEBUG_CB=y -# end of Console - -CONFIG_ACPI_S1_NOT_SUPPORTED=y -CONFIG_HAVE_ACPI_RESUME=y -CONFIG_RESUME_PATH_SAME_AS_BOOT=y -CONFIG_HAVE_MONOTONIC_TIMER=y -CONFIG_ACPI_NHLT=y - -# -# System tables -# -CONFIG_GENERATE_SMBIOS_TABLES=y -CONFIG_BIOS_VENDOR="coreboot" -# end of System tables - -# -# Payload -# -# CONFIG_PAYLOAD_NONE is not set -# CONFIG_PAYLOAD_ELF is not set -# CONFIG_PAYLOAD_FLAT_BINARY is not set -# CONFIG_PAYLOAD_BOOTBOOT is not set -# CONFIG_PAYLOAD_CRABEFI is not set -# CONFIG_PAYLOAD_FILO is not set -# CONFIG_PAYLOAD_GRUB2 is not set -# CONFIG_PAYLOAD_SEAGRUB is not set -# CONFIG_PAYLOAD_LINUXBOOT is not set -# CONFIG_PAYLOAD_SEABIOS is not set -# CONFIG_PAYLOAD_UBOOT is not set -CONFIG_PAYLOAD_EDK2=y -# CONFIG_PAYLOAD_LINUX is not set -CONFIG_PAYLOAD_FILE="build/UEFIPAYLOAD.fd" -CONFIG_EDK2_UEFIPAYLOAD=y -# CONFIG_EDK2_UNIVERSAL_PAYLOAD is not set -CONFIG_EDK2_REPO_MRCHROMEBOX=y -# CONFIG_EDK2_REPO_OFFICIAL is not set -# CONFIG_EDK2_REPO_CUSTOM is not set -CONFIG_EDK2_REPOSITORY="https://github.com/mrchromebox/edk2" -CONFIG_EDK2_TAG_OR_REV="26.09" -# CONFIG_EDK2_USE_EDK2_PLATFORMS is not set -# CONFIG_EDK2_DEBUG is not set -CONFIG_EDK2_RELEASE=y -# CONFIG_EDK2_CBMEM_LOGGING is not set -CONFIG_EDK2_CPU_TIMER_LIB=y -CONFIG_EDK2_HAVE_EFI_SHELL=y -CONFIG_EDK2_PRIORITIZE_INTERNAL=y -# CONFIG_EDK2_LOAD_OPTION_ROMS is not set -CONFIG_EDK2_PS2_SUPPORT=y -CONFIG_EDK2_SD_MMC_TIMEOUT=10 -# CONFIG_EDK2_SERIAL_SUPPORT is not set -CONFIG_EDK2_USE_LVGL_RENDERER=y -# CONFIG_EDK2_DISABLE_TPM is not set -# CONFIG_EDK2_USE_LAPIC_TIMER is not set -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" -# CONFIG_EDK2_ENABLE_IPXE is not set -# CONFIG_PXE is not set -# CONFIG_COMPRESSED_PAYLOAD_NONE is not set -CONFIG_COMPRESSED_PAYLOAD_LZMA=y -# CONFIG_COMPRESSED_PAYLOAD_ZSTD is not set -# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set -CONFIG_COMPRESS_SECONDARY_PAYLOAD=y - -# -# Secondary Payloads -# -# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set -# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set -# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set -# CONFIG_SEABIOS_SECONDARY_PAYLOAD is not set -# CONFIG_TINT_SECONDARY_PAYLOAD is not set -# CONFIG_COREDOOM_SECONDARY_PAYLOAD is not set -# end of Secondary Payloads -# end of Payload - -# -# Debugging -# - -# -# CPU Debug Settings -# -# CONFIG_DISPLAY_MTRRS is not set - -# -# Vendorcode Debug Settings -# - -# -# BLOB Debug Settings -# -# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set -# CONFIG_DISPLAY_FSP_HEADER is not set -# CONFIG_VERIFY_HOBS is not set -# CONFIG_DISPLAY_FSP_VERSION_INFO is not set -CONFIG_HAVE_GPIO_SNAPSHOT_VERIFY_SUPPORT=y -# CONFIG_CHECK_GPIO_CONFIG_CHANGES is not set - -# -# General Debug Settings -# -# CONFIG_GDB_STUB is not set -CONFIG_HAVE_DEBUG_GPIO=y -# CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_CBFS is not set -CONFIG_HAVE_DEBUG_SMBUS=y -# CONFIG_DEBUG_SMBUS is not set -# CONFIG_DEBUG_MALLOC is not set -# CONFIG_DEBUG_CONSOLE_INIT is not set -# CONFIG_DEBUG_SPI_FLASH is not set -# CONFIG_DEBUG_BOOT_STATE is not set -# CONFIG_DEBUG_ADA_CODE is not set -# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set -# end of Debugging - -CONFIG_RAMSTAGE_ADA=y -CONFIG_RAMSTAGE_LIBHWBASE=y -CONFIG_SPD_READ_BY_WORD=y -CONFIG_HWBASE_DYNAMIC_MMIO=y -CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000 -CONFIG_HWBASE_DIRECT_PCIDEV=y -CONFIG_DECOMPRESS_OFAST=y - -# -# Boot Logo Configuration -# -# CONFIG_BMP_LOGO is not set -# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set -# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set -# end of Boot Logo Configuration - -CONFIG_MAX_REBOOT_CNT=3 -CONFIG_RELOCATABLE_MODULES=y -CONFIG_GENERIC_GPIO_LIB=y -CONFIG_HAVE_BOOTBLOCK=y -CONFIG_HAVE_ROMSTAGE=y -CONFIG_HAVE_RAMSTAGE=y diff --git a/config/module/edk2/mrchromebox/target.cfg b/config/module/edk2/mrchromebox/target.cfg deleted file mode 100644 index 90b914d9..00000000 --- a/config/module/edk2/mrchromebox/target.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -# look inside default/ -# all the logic for this hack is in there! - -tree="default" diff --git a/config/submodule/edk2/default/arm-trusted-firmware/module.cfg b/config/submodule/edk2/default/arm-trusted-firmware/module.cfg deleted file mode 100644 index 08331cf5..00000000 --- a/config/submodule/edk2/default/arm-trusted-firmware/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/arm-trusted-firmware.git" -subgit_bkup="https://github.com/coreboot/arm-trusted-firmware" -subhash="b5eaba47efc5e4e3029086d5c25eee0e8dbb0129" diff --git a/config/submodule/edk2/default/cmocka/module.cfg b/config/submodule/edk2/default/cmocka/module.cfg deleted file mode 100644 index 32a43066..00000000 --- a/config/submodule/edk2/default/cmocka/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/cmocka.git" -subgit_bkup="https://github.com/coreboot/cmocka" -subhash="8be37372097d1aa5e03b565936db7891b6180e73" diff --git a/config/submodule/edk2/default/cmocka/patches/0001-disable-Werror.patch b/config/submodule/edk2/default/cmocka/patches/0001-disable-Werror.patch deleted file mode 100644 index 8bf8bf10..00000000 --- a/config/submodule/edk2/default/cmocka/patches/0001-disable-Werror.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0762c4d3ad28239550f39793946c00a4866a797f Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 10:49:57 +0100 -Subject: [PATCH 1/1] disable -Werror - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - .ycm_extra_conf.py | 1 - - CompilerChecks.cmake | 17 ----------------- - 2 files changed, 18 deletions(-) - -diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py -index 8305a8b..538bc2b 100644 ---- a/.ycm_extra_conf.py -+++ b/.ycm_extra_conf.py -@@ -4,7 +4,6 @@ import ycm_core - flags = [ - '-Wall', - '-Wextra', --'-Werror', - '-x', 'c', - '-Iinclude', - ] -diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake -index e39cc1d..9ee5462 100644 ---- a/CompilerChecks.cmake -+++ b/CompilerChecks.cmake -@@ -7,14 +7,6 @@ if (UNIX) - # - # This will prevent that compiler flags are detected incorrectly. - # -- check_c_compiler_flag("-Werror" REQUIRED_FLAGS_WERROR) -- if (REQUIRED_FLAGS_WERROR) -- set(CMAKE_REQUIRED_FLAGS "-Werror") -- -- if (PICKY_DEVELOPER) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-Werror") -- endif() -- endif() - - add_c_compiler_flag("-std=gnu99" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wpedantic" SUPPORTED_COMPILER_FLAGS) -@@ -23,20 +15,12 @@ if (UNIX) - add_c_compiler_flag("-Wmissing-prototypes" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wcast-align" SUPPORTED_COMPILER_FLAGS) - #add_c_compiler_flag("-Wcast-qual" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=address" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wstrict-prototypes" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=strict-prototypes" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wwrite-strings" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=write-strings" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror-implicit-function-declaration" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wpointer-arith" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=pointer-arith" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wreturn-type" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=return-type" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wuninitialized" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=uninitialized" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wimplicit-fallthrough" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=strict-overflow" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wstrict-overflow=2" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wno-format-zero-length" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wmissing-field-initializers" SUPPORTED_COMPILER_FLAGS) -@@ -47,7 +31,6 @@ if (UNIX) - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wformat") - endif() - add_c_compiler_flag("-Wformat-security" SUPPORTED_COMPILER_FLAGS) -- add_c_compiler_flag("-Werror=format-security" SUPPORTED_COMPILER_FLAGS) - - # Allow zero for a variadic macro argument - string(TOLOWER "${CMAKE_C_COMPILER_ID}" _C_COMPILER_ID) --- -2.47.3 - diff --git a/config/submodule/edk2/default/fsp/module.cfg b/config/submodule/edk2/default/fsp/module.cfg deleted file mode 100644 index fc238774..00000000 --- a/config/submodule/edk2/default/fsp/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/fsp.git" -subgit_bkup="https://github.com/coreboot/fsp" -subhash="98426bfd958eb7397c474ff5d440dc9a1d146215" diff --git a/config/submodule/edk2/default/intel-microcode/module.cfg b/config/submodule/edk2/default/intel-microcode/module.cfg deleted file mode 100644 index b5b452c4..00000000 --- a/config/submodule/edk2/default/intel-microcode/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/intel-microcode.git" -subgit_bkup="https://github.com/coreboot/intel-microcode" -subhash="927e65c8d5a6e4ec05cc74b1778283ab2284d0c1" diff --git a/config/submodule/edk2/default/libgfxinit/module.cfg b/config/submodule/edk2/default/libgfxinit/module.cfg deleted file mode 100644 index 480ba0f1..00000000 --- a/config/submodule/edk2/default/libgfxinit/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/libgfxinit.git" -subgit_bkup="https://github.com/coreboot/libgfxinit" -subhash="6e74c703132a8b4af4354a5158f286dc8f2407ab" diff --git a/config/submodule/edk2/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch b/config/submodule/edk2/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch deleted file mode 100644 index 71c34e5a..00000000 --- a/config/submodule/edk2/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9be431356fce5b70875b938c3fbd6f6927031f23 Mon Sep 17 00:00:00 2001 -From: Nicholas Chin <nic.c3.14@gmail.com> -Date: Mon, 20 May 2024 10:10:03 -0600 -Subject: [PATCH 1/2] g45/hw-gfx-gma-plls.adb: Make reference clock frequency - configurable - -Instead of assuming a 96 MHz reference clock frequency, use the value -specified by the new INTEL_GMA_DPLL_REF_FREQ Kconfig. This defaults to -96 MHz to preserve the existing behavior. An example of where this is -needed is the DPLL_REF_SSCLK input, which will typically be 100 MHz -to support LVDS spread spectrum clocking. - -Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com> ---- - common/g45/hw-gfx-gma-plls.adb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/g45/hw-gfx-gma-plls.adb b/common/g45/hw-gfx-gma-plls.adb -index 2b93444..38d6dec 100644 ---- a/common/g45/hw-gfx-gma-plls.adb -+++ b/common/g45/hw-gfx-gma-plls.adb -@@ -12,6 +12,8 @@ - -- GNU General Public License for more details. - -- - -+with CB.Config; -+ - with HW.Time; - with HW.GFX.GMA.Config; - with HW.GFX.GMA.Registers; -@@ -490,7 +492,7 @@ is - Calculate_Clock_Parameters - (Target_Dotclock => Target_Clock, - -- should be, but doesn't has to be always the same: -- Reference_Clock => 96_000_000, -+ Reference_Clock => CB.Config.INTEL_GMA_DPLL_REF_FREQ, - Limits => Select_Limits (Port_Cfg.Display, Target_Clock), - Best_Clock => Clk, - Valid => Success); --- -2.47.3 - diff --git a/config/submodule/edk2/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch b/config/submodule/edk2/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch deleted file mode 100644 index 2cc3c0b4..00000000 --- a/config/submodule/edk2/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 82f4346eba8fdfb0c11f19a4a0f26bd391c259b4 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 13 Jul 2025 15:18:53 +0100 -Subject: [PATCH 2/2] re-try EDID reading when it fails - -some video converters are a bit buggy and have to be -probed twice; linux works fine, but in these cases, -coreboot won't set up the display. - -try it twice, to mitigate, when probing the EDID - -This entire function should probably be rewritten, since -it's buggy in general. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - common/hw-gfx-gma-display_probing.adb | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/common/hw-gfx-gma-display_probing.adb b/common/hw-gfx-gma-display_probing.adb -index 6908055..abaa2b6 100644 ---- a/common/hw-gfx-gma-display_probing.adb -+++ b/common/hw-gfx-gma-display_probing.adb -@@ -140,6 +140,11 @@ is - Read_EDID (Raw_EDID, Port, Success); - end if; - -+ if not Success then -+ Panel.Wait_On (Config_Helpers.To_Panel (Port)); -+ Read_EDID (Raw_EDID, Port, Success); -+ end if; -+ - if Success and then - ((not Is_DVI_I (Port) or EDID.Compatible_Display - (Raw_EDID, Config_Helpers.To_Display_Type (Port))) and --- -2.47.3 - diff --git a/config/submodule/edk2/default/libhwbase/0001-remove-Werror.patch b/config/submodule/edk2/default/libhwbase/0001-remove-Werror.patch deleted file mode 100644 index 8f0eba58..00000000 --- a/config/submodule/edk2/default/libhwbase/0001-remove-Werror.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5453dc70cdf327e5b4228fbce34b03107936628f Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 10:58:18 +0100 -Subject: [PATCH 1/1] remove -Werror - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e8d864e..9c10fb6 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ endif - CC = $(CROSS_COMPILE)gcc - GNATBIND = $(CROSS_COMPILE)gnatbind - --CFLAGS += -Wuninitialized -Wall -Werror -+CFLAGS += -Wuninitialized -Wall - CFLAGS += -pipe -g - CFLAGS += -Wstrict-aliasing -Wshadow - CFLAGS += -fno-common -fomit-frame-pointer --- -2.47.3 - diff --git a/config/submodule/edk2/default/libhwbase/module.cfg b/config/submodule/edk2/default/libhwbase/module.cfg deleted file mode 100644 index bb12f0f0..00000000 --- a/config/submodule/edk2/default/libhwbase/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/libhwbase.git" -subgit_bkup="https://github.com/coreboot/libhwbase" -subhash="61f7287f18b249408a79bf9ab5e72568965cca2c" diff --git a/config/submodule/edk2/default/module.list b/config/submodule/edk2/default/module.list deleted file mode 100644 index c5a2f880..00000000 --- a/config/submodule/edk2/default/module.list +++ /dev/null @@ -1,7 +0,0 @@ -3rdparty/arm-trusted-firmware -3rdparty/fsp -3rdparty/intel-microcode -3rdparty/libgfxinit -3rdparty/libhwbase -3rdparty/vboot -3rdparty/cmocka diff --git a/config/submodule/edk2/default/vboot/module.cfg b/config/submodule/edk2/default/vboot/module.cfg deleted file mode 100644 index c47b5778..00000000 --- a/config/submodule/edk2/default/vboot/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/vboot.git" -subgit_bkup="https://github.com/coreboot/vboot" -subhash="5c360ef458b0a013d8a6d47724bb0fffb5accbcf" diff --git a/config/submodule/edk2/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch b/config/submodule/edk2/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch deleted file mode 100644 index 1ac41de6..00000000 --- a/config/submodule/edk2/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 195f61375aeec9eec16604ec59f6eda2e6058cc1 Mon Sep 17 00:00:00 2001 -From: "Luke T. Shumaker" <lukeshu@lukeshu.com> -Date: Thu, 30 May 2024 14:08:33 -0600 -Subject: [PATCH 1/1] extract_vmlinuz.c: Fix the bounds check on - vmlinuz_header_{offset,size} - -The check on vmlinuz_header_offset and vmlinuz_header_size is obviously -wrong: - - if (!vmlinuz_header_size || - kpart_data + vmlinuz_header_offset + vmlinuz_header_size > - kpart_data) { - return 1; - } - -`kpart_data + some_unsigned_values` can obviously never be `> kpart_data`, -unless something has overflowed! And `vmlinuz_header_offset` hasn't even -been set yet (besides being initialized to zero)! - -GCC will deduce that if the check didn't cause the function to bail, then -vmlinuz_header_size (a uint32_t) must be "negative"; that is: in the range -[2GiB,4GiB). - -On platforms where size_t is 32-bits, this is *especially* broken. -memcpy's size argument must be in the range [0,2GiB). Because GCC has -proved that vmlinuz_header_size is higher than that, it will fail to -compile: - - host/lib/extract_vmlinuz.c:67:9: error: 'memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Werror=stringop-overflow=] - -So, fix the check. - -I can now say that what I suspect the original author meant to write would -be the following patch, if `vmlinuz_header_offset` were already set: - - -kpart_data + vmlinuz_header_offset + vmlinuz_header_size > kpart_data - +now + vmlinuz_header_offset + vmlinuz_header_size > kpart_size - -This hypothesis is supported by `now` not getting incremented by -`kblob_size` the way it is for the keyblock and preamble sizes. - -However, we can also see that even this "corrected" bounds check is -insufficient: it does not detect the vmlinuz_header overflowing into -kblob_data. - -OK, so let's describe the fix: - -Have a `*vmlinuz_header` pointer instead of a -`uint64_t vmlinuz_header_offset`, to be more similar to all the other -regions. With this change, the correct check becomes a simple - - vmlinuz_header + vmlinuz_header_size > kblob_data - -While we're at it, make some changes that could have helped avoid this in -the first place: - - - Add comments. - - Calculate the vmlinuz_header offset right away, instead of waiting. - - Go ahead and increment `now` by `kblob_size`, to increase regularity. - -Change-Id: I5c03e49070b6dd2e04459566ef7dd129d27736e4 ---- - host/lib/extract_vmlinuz.c | 72 +++++++++++++++++++++++++++----------- - 1 file changed, 51 insertions(+), 21 deletions(-) - -diff --git a/host/lib/extract_vmlinuz.c b/host/lib/extract_vmlinuz.c -index 4ccfcf33..d2c09443 100644 ---- a/host/lib/extract_vmlinuz.c -+++ b/host/lib/extract_vmlinuz.c -@@ -15,16 +15,44 @@ - - int ExtractVmlinuz(void *kpart_data, size_t kpart_size, - void **vmlinuz_out, size_t *vmlinuz_size) { -+ // We're going to be extracting `vmlinuz_header` and -+ // `kblob_data`, and returning the concatenation of them. -+ // -+ // kpart_data = +-[kpart_size]------------------------------------+ -+ // | | -+ // keyblock = | +-[keyblock->keyblock_size]-------------------+ | -+ // | | struct vb2_keyblock keyblock | | -+ // | | char [] ...data... | | -+ // | +---------------------------------------------+ | -+ // | | -+ // preamble = | +-[preamble->preamble_size]-------------------+ | -+ // | | struct vb2_kernel_preamble preamble | | -+ // | | char [] ...data... | | -+ // | | char [] vmlinuz_header | | -+ // | | char [] ...data... | | -+ // | +---------------------------------------------+ | -+ // | | -+ // kblob_data= | +-[preamble->body_signature.data_size]--------+ | -+ // | | char [] ...data... | | -+ // | +---------------------------------------------+ | -+ // | | -+ // +-------------------------------------------------+ -+ - size_t now = 0; -+ // The 3 sections of kpart_data. -+ struct vb2_keyblock *keyblock = NULL; - struct vb2_kernel_preamble *preamble = NULL; - uint8_t *kblob_data = NULL; - uint32_t kblob_size = 0; -+ // vmlinuz_header -+ uint8_t *vmlinuz_header = NULL; - uint32_t vmlinuz_header_size = 0; -- uint64_t vmlinuz_header_address = 0; -- uint64_t vmlinuz_header_offset = 0; -+ // The concatenated result. - void *vmlinuz = NULL; - -- struct vb2_keyblock *keyblock = (struct vb2_keyblock *)kpart_data; -+ // Isolate the 3 sections of kpart_data. -+ -+ keyblock = (struct vb2_keyblock *)kpart_data; - now += keyblock->keyblock_size; - if (now > kpart_size) - return 1; -@@ -36,37 +64,39 @@ int ExtractVmlinuz(void *kpart_data, size_t kpart_size, - - kblob_data = kpart_data + now; - kblob_size = preamble->body_signature.data_size; -- -- if (!kblob_data || (now + kblob_size) > kpart_size) -+ now += kblob_size; -+ if (now > kpart_size) - return 1; - -+ // Find `vmlinuz_header` within `preamble`. -+ - if (preamble->header_version_minor > 0) { -- vmlinuz_header_address = preamble->vmlinuz_header_address; -+ // calculate the vmlinuz_header offset from -+ // the beginning of the kpart_data. The kblob doesn't -+ // include the body_load_offset, but does include -+ // the keyblock and preamble sections. -+ size_t vmlinuz_header_offset = -+ preamble->vmlinuz_header_address - -+ preamble->body_load_address + -+ keyblock->keyblock_size + -+ preamble->preamble_size; -+ -+ vmlinuz_header = kpart_data + vmlinuz_header_offset; - vmlinuz_header_size = preamble->vmlinuz_header_size; - } - -- if (!vmlinuz_header_size || -- kpart_data + vmlinuz_header_offset + vmlinuz_header_size > -- kpart_data) { -+ if (!vmlinuz_header || -+ !vmlinuz_header_size || -+ vmlinuz_header + vmlinuz_header_size > kblob_data) { - return 1; - } - -- // calculate the vmlinuz_header offset from -- // the beginning of the kpart_data. The kblob doesn't -- // include the body_load_offset, but does include -- // the keyblock and preamble sections. -- vmlinuz_header_offset = vmlinuz_header_address - -- preamble->body_load_address + -- keyblock->keyblock_size + -- preamble->preamble_size; -+ // Concatenate and return. - - vmlinuz = malloc(vmlinuz_header_size + kblob_size); - if (vmlinuz == NULL) - return 1; -- -- memcpy(vmlinuz, kpart_data + vmlinuz_header_offset, -- vmlinuz_header_size); -- -+ memcpy(vmlinuz, vmlinuz_header, vmlinuz_header_size); - memcpy(vmlinuz + vmlinuz_header_size, kblob_data, kblob_size); - - *vmlinuz_out = vmlinuz; --- -2.45.1 - diff --git a/config/submodule/edk2/default/vboot/patches/0002-lib-cbfstool-fix-build-error-on-newer-hostcc.patch b/config/submodule/edk2/default/vboot/patches/0002-lib-cbfstool-fix-build-error-on-newer-hostcc.patch deleted file mode 100644 index 6d5ba873..00000000 --- a/config/submodule/edk2/default/vboot/patches/0002-lib-cbfstool-fix-build-error-on-newer-hostcc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efeac4de14e3ac46e9146bc6a2d2e03ca04757f1 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Wed, 1 Apr 2026 08:10:09 +0100 -Subject: [PATCH] lib/cbfstool: fix build error on newer hostcc - -const char being discarded. classic rookie mistake. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - host/lib/cbfstool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/lib/cbfstool.c b/host/lib/cbfstool.c -index 9b4de49e..2a2578c0 100644 ---- a/host/lib/cbfstool.c -+++ b/host/lib/cbfstool.c -@@ -259,7 +259,7 @@ static char *extract_config_value(const char *buf, const char *config_field) - free(to_find); - - if (start) { -- char *end = strchr(start, '\n'); -+ const char *end = strchr(start, '\n'); - if (end) - return strndup(start, end - start); - } --- -2.47.3 - diff --git a/config/submodule/edk2/default/vboot/patches/0003-remove-Werror.patch b/config/submodule/edk2/default/vboot/patches/0003-remove-Werror.patch deleted file mode 100644 index fbc60940..00000000 --- a/config/submodule/edk2/default/vboot/patches/0003-remove-Werror.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f71d1e0981fa3a9ea8201cac97631486a90d5ce4 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 21 Sep 2026 11:01:00 +0100 -Subject: [PATCH 1/1] remove -Werror - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - Android.bp | 1 - - Makefile | 6 ++---- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Android.bp b/Android.bp -index dec72cc8..1974a1a2 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -9,7 +9,6 @@ cc_defaults { - - cflags: [ - "-Wall", -- "-Werror", - "-Wstrict-prototypes", - "-Wtype-limits", - "-Wundef", -diff --git a/Makefile b/Makefile -index 67af60d4..4243a03a 100644 ---- a/Makefile -+++ b/Makefile -@@ -113,9 +113,8 @@ endif - # Provide default CC and CFLAGS for firmware builds; if you have any -D flags, - # please add them after this point (e.g., -DVBOOT_DEBUG). - DEBUG_FLAGS := $(if $(filter-out 0,${DEBUG}),-g -Og,-g -Os) --WERROR := -Werror - FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector --COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \ -+COMMON_FLAGS := -pipe -Wall -Wstrict-prototypes -Wtype-limits \ - -Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \ - -Wwrite-strings -Wstrict-aliasing -Wdate-time \ - -Wint-conversion -ffunction-sections -fdata-sections \ -@@ -127,7 +126,7 @@ COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \ - # returns: $(1) if compiler was successful, empty string otherwise - test_ccflag = $(shell \ - printf "$(2)\nvoid _start(void) {}\n" | \ -- $(CC) -nostdlib -Werror $(1) -xc -c - -o /dev/null \ -+ $(CC) -nostdlib $(1) -xc -c - -o /dev/null \ - >/dev/null 2>&1 && echo "$(1)") - - COMMON_FLAGS += $(call test_ccflag,-Wimplicit-fallthrough) -@@ -499,7 +498,6 @@ UTILLIB = ${BUILD}/libvboot_util.a - # Avoid build failures outside the chroot on Ubuntu 2022.04 - # e.g.: - # host/lib/host_key2.c:103:17: error: ‘RSA_free’ is deprecated: Since OpenSSL 3.0 --# [-Werror=deprecated-declarations] - ifeq ($(OPENSSL_VERSION),3) - ${UTILLIB}: CFLAGS += -Wno-error=deprecated-declarations - endif --- -2.47.3 - diff --git a/include/fw/rom.sh b/include/fw/rom.sh index 84f2e2bb..5bd1c70c 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -60,6 +60,9 @@ corebootpremake() [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \ return 0 + [ "$XBMK_RELEASE" = "y" ] && \ + payload_edk2="" # source-only payload, for now. + forx 'check_coreboot_util %s' cbfstool ifdtool printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \ @@ -69,6 +72,41 @@ corebootpremake() x_ "$mk" download "$target"; : } +cook_coreboot_config() +{ + [ -n "$mode" ] && return 0 + [ -f "$srcdir/$cfgname" ] || return 0 + + [ -n "$payload_edk2" ] && \ + cook_coreboot_smmstore + + x_ make -C "$srcdir" oldconfig +} + +cook_coreboot_smmstore() +{ + # Enable SMMSTORE-related options for EDK2 variable storage. + # Because edk2 is source-only (release=n) in lbmk, we don't + # enable this in the configs themselves. Instead, we add it + # when building a board with EDK2 support in lbmk.git + + # TODO: this relpaces the option backend. i need to make + # coreboot always use a cbfs backend, and set all + # boards universally that way, before starting edk2 + + ecfg="CONFIG_SMMSTORE_BLOCK_SIZE=65536 \ + CONFIG_DRIVERS_EFI_VARIABLE_STORE=y \ + CONFIG_SMMSTORE=y \ + CONFIG_SMMSTORE_SIZE=0x80000 \ + CONFIG_SPI_FLASH_SMM=y \ + CONFIG_DRIVERS_GENERIC_CFR_ASSET_TAG=y \ + CONFIG_USE_UEFI_VARIABLE_STORE=y" # replace option backend + + for ecfgval in $ecfg; do + printf "%s\n" "$ecfgval" >> "$srcdir/$cfgname" + done +} + check_coreboot_util() { e "elf/coreboot/$tree/$1" f && \ @@ -122,9 +160,6 @@ mkcorebootbin_real() { [ "$target" = "$tree" ] && return 0 - [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \ - payload_edk2="" # source-only payload, for now. - tmprom="$xbtmp/coreboot.rom" initmode="${buildcfg##*/}" @@ -177,6 +212,12 @@ mkcorebootbin_real() [ "$payload_grub" != "y" ] && \ payload_grubsea="n" + if [ "$initmode" != "libgfxinit" ] || \ + [ "$displaymode" != "corebootfb" ]; then + [ "$initmode" != "fspgop" ] && [ "$initmode" != "normal" ] && \ + payload_edk2="" # disable on txtmode + fi + $if_not_skip_build prep_tmprom if grep "CONFIG_PAYLOAD_NONE=y" "$buildcfg"; then @@ -230,7 +271,7 @@ add_cbfs_option() add_edk2() { - edk2dir="elf/edk2/default/$payload_edk2" + edk2dir="elf/coreboot/default/$payload_edk2" edk2="$edk2dir/libgfxinit_corebootfb/UEFIPAYLOAD.fd" cbfs "$tmprom" "$edk2" "$1" @@ -380,8 +421,6 @@ cprom() cbfs "$irom" "$grubdata/keymap/$tmpnew" keymap.gkb raw elif [ "$1" = "seauboot" ]; then cbfs "$irom" "$grubdata/bootorder_uboot" bootorder raw - elif [ "$1" = "seauboot" ]; then - cbfs "$irom" "$grubdata/bootorder_edk2" bootorder raw fi fi @@ -89,7 +89,7 @@ eval "`newvar if_not_make_config if_not_build if_not_dry_build if_not_fetch`" cfgvars="autogenargs cmakedir configureargs badhash badtghash bootstrapargs \ build_depend cleanargs fetch_depend makeargs mkhelper noconfig postmake \ premake release rev tree xarch xgcctree xlang cfgname defscan \ - if_not_skip_build" + if_not_skip_build cook_config" eval "`newvar buildcfg dest_dir elfdir flag forcepull listfile mdir \ mkhelpercfg mode project srcdir target target_dir _tcfg \ @@ -391,6 +391,9 @@ run_make_command() $if_build \ check_autoconf "$srcdir" + $if_build \ + x_ $cook_config + check_makefile "$srcdir" && \ x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs } |
