diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-20 23:22:00 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-20 23:22:00 +0100 |
| commit | 627156c0983afaae698babc2ccd75a59547bb417 (patch) | |
| tree | a54317a2ad053f876187ac215cf1c10add5ea8df | |
| parent | 361e9fadcc0b28240d8859eeb1965f153264c36d (diff) | |
remove coreboot/fam15h_cb411 (keep fam15h_15h)
4.11_branch is now completely gone. kfsn4-dre is using it.
if it doesn't build, i'll just set kfs to release=n. that
board never worked properly anyway and isn't officially
supported by 15h.org either.
Signed-off-by: Leah Rowe <leah@libreboot.org>
32 files changed, 22 insertions, 1023 deletions
diff --git a/config/module/coreboot/fam15h_cb411/nuke.list b/config/module/coreboot/fam15h_cb411/nuke.list deleted file mode 100644 index 8ca7a4cf..00000000 --- a/config/module/coreboot/fam15h_cb411/nuke.list +++ /dev/null @@ -1 +0,0 @@ -3rdparty/vboot/tests diff --git a/config/module/coreboot/fam15h_cb411/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch b/config/module/coreboot/fam15h_cb411/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch deleted file mode 100644 index 5a39bd69..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7a00638cea41ad939a59fc0e5996959435fbdb7f Mon Sep 17 00:00:00 2001 -From: "D.d.P.F. Lombard" <lombard@lombards.xyz> -Date: Sun, 7 Feb 2021 16:40:05 +0100 -Subject: [PATCH 3/6] Tweak cmos defaults for KCMA-D8 (for a little speed - boost) - -63xx CPUs have the option to use a reduced latency value inside the crossbar. -Setting "experimental_memory_speed_boost=Enable" aparently only has an effect -on 63xx CPUs and may, in certain cases, yield a slight memory bandwidth -increase (according to Timothy Pearson), but maybe it also works for -43xx CPUs. - -Setting "l3_cache_partitioning=Enable" will increase performance in certain -situations. See: -https://developer.arm.com/documentation/100453/0401/functional-description/l3-cache/l3-cache-partitioning?lang=en ---- - src/mainboard/asus/kcma-d8/cmos.default | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mainboard/asus/kcma-d8/cmos.default b/src/mainboard/asus/kcma-d8/cmos.default -index 306687157f..4e033d756f 100644 ---- a/src/mainboard/asus/kcma-d8/cmos.default -+++ b/src/mainboard/asus/kcma-d8/cmos.default -@@ -21,9 +21,9 @@ sata_ahci_mode=Enable - sata_alpm=Disable - maximum_p_state_limit=0xf - probe_filter=Auto --l3_cache_partitioning=Disable -+l3_cache_partitioning=Enable - gart=Enable - ehci_async_data_cache=Enable --experimental_memory_speed_boost=Disable -+experimental_memory_speed_boost=Enable - power_on_after_fail=On - boot_option=Fallback --- -2.25.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch b/config/module/coreboot/fam15h_cb411/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch deleted file mode 100644 index 5ada0dff..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f0aac7261e16adc8e61eca7a506ff2de5112be47 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Fri, 7 May 2021 19:43:32 +0100 -Subject: [PATCH 6/6] asus/kgpe-d16: enable lc_cache_partitioning and - experimental_memory_speed_boost - -This really only benefits 63xx opterons which are less reliable in libreboot due -to lack of CPU microcode updates, but we might aswell enable this anyway. ---- - src/mainboard/asus/kgpe-d16/cmos.default | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mainboard/asus/kgpe-d16/cmos.default b/src/mainboard/asus/kgpe-d16/cmos.default -index 7c496a50d7..8a25620e1d 100644 ---- a/src/mainboard/asus/kgpe-d16/cmos.default -+++ b/src/mainboard/asus/kgpe-d16/cmos.default -@@ -21,10 +21,10 @@ sata_ahci_mode=Enable - sata_alpm=Disable - maximum_p_state_limit=0xf - probe_filter=Auto --l3_cache_partitioning=Disable -+l3_cache_partitioning=Enable - ieee1394_controller=Enable - gart=Enable - ehci_async_data_cache=Enable --experimental_memory_speed_boost=Disable -+experimental_memory_speed_boost=Enable - power_on_after_fail=On - boot_option=Fallback --- -2.25.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0007-util-cbfstool-Makefile-support-distclean.patch b/config/module/coreboot/fam15h_cb411/patches/0007-util-cbfstool-Makefile-support-distclean.patch deleted file mode 100644 index 87db312c..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0007-util-cbfstool-Makefile-support-distclean.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d5dc3f23eb546cf328fdfe1e918afa028fb9cd8c Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 9 Jul 2023 04:13:52 +0100 -Subject: [PATCH 1/1] util/cbfstool Makefile: support distclean - -it just does make-clean - -this is so that this super-old coreboot revision -interfaces well with lbmk, which runs distclean -on cbfstool (which is supported, on modern cbfstool) - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/cbfstool/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile -index d5321f6959..b8424d7d87 100644 ---- a/util/cbfstool/Makefile -+++ b/util/cbfstool/Makefile -@@ -26,7 +26,7 @@ ifittool: $(objutil)/cbfstool/ifittool - - cbfs-compression-tool: $(objutil)/cbfstool/cbfs-compression-tool - --.PHONY: clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool -+.PHONY: distclean clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool - clean: - $(RM) fmd_parser.c fmd_parser.h fmd_scanner.c fmd_scanner.h - $(RM) $(objutil)/cbfstool/cbfstool $(cbfsobj) -@@ -55,6 +55,8 @@ install: all - $(INSTALL) ifittool $(DESTDIR)$(BINDIR) - $(INSTALL) cbfs-compression-tool $(DESTDIR)$(BINDIR) - -+distclean: clean -+ - ifneq ($(V),1) - .SILENT: - endif --- -2.40.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch b/config/module/coreboot/fam15h_cb411/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch deleted file mode 100644 index 72681490..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4b4b2bdc2cedb3e219c6f90809e5684441b1dafa Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 9 Jul 2023 04:54:19 +0100 -Subject: [PATCH 1/1] crossgcc: patch binutils 2.32 for newer hostcc - -tested on debian sid as of 9 July 2023 - -implicit string declaration - -easy peasy - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/patches/binutils-2.32_stringfix.patch | 11 +++++++++++ - 1 file changed, 11 insertions(+) - create mode 100644 util/crossgcc/patches/binutils-2.32_stringfix.patch - -diff --git a/util/crossgcc/patches/binutils-2.32_stringfix.patch b/util/crossgcc/patches/binutils-2.32_stringfix.patch -new file mode 100644 -index 0000000000..de27a2752a ---- /dev/null -+++ b/util/crossgcc/patches/binutils-2.32_stringfix.patch -@@ -0,0 +1,11 @@ -+diff -u binutils-2.32/gold/errors.h binutils-2.32.patched/gold/errors.h -+--- binutils-2.32/gold/errors.h -++++ binutils-2.32.patched/gold/errors.h -+@@ -24,6 +24,7 @@ -+ #define GOLD_ERRORS_H -+ -+ #include <cstdarg> -++#include <string> -+ -+ #include "gold-threads.h" -+ --- -2.40.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch b/config/module/coreboot/fam15h_cb411/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch deleted file mode 100644 index ecc06d00..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 373dd351e374f391c9e2048e5f3e535267a04719 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 9 Jul 2023 19:37:39 +0100 -Subject: [PATCH 1/1] fix crossgcc/acpica build on newer hostcc - -Changes made to acpica/iasl: - -remove superfluous YYSTYPE declaration - -make LuxBuffer variables static, to avoid warnings -treated as errors about multiple definitions - -AcpiGbl_DbOpt_NoRegionSupport - remove this definition -in source/tools/acpiexec/aemain.c because it's already -re-defined by acpiexec. otherwise the linker complains -about multiple definitions - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - .../acpica-unix2-20190703_mitigategcc.patch | 76 +++++++++++++++++++ - 1 file changed, 76 insertions(+) - create mode 100644 util/crossgcc/patches/acpica-unix2-20190703_mitigategcc.patch - -diff --git a/util/crossgcc/patches/acpica-unix2-20190703_mitigategcc.patch b/util/crossgcc/patches/acpica-unix2-20190703_mitigategcc.patch -new file mode 100644 -index 0000000000..8de47245bd ---- /dev/null -+++ b/util/crossgcc/patches/acpica-unix2-20190703_mitigategcc.patch -@@ -0,0 +1,76 @@ -+From 66b927d923183ff62c9a757fafdeca9d1ac3fa87 Mon Sep 17 00:00:00 2001 -+From: Leah Rowe <leah@libreboot.org> -+Date: Sun, 9 Jul 2023 18:58:11 +0100 -+Subject: [PATCH 1/1] fix building on newer hostcc (debian sid tested) -+ -+remove superfluous YYSTYPE declaration -+ -+make LuxBuffer variables static, to avoid warnings -+treated as errors about multiple definitions -+ -+AcpiGbl_DbOpt_NoRegionSupport - remove this definition -+in source/tools/acpiexec/aemain.c because it's already -+re-defined by acpiexec. otherwise the linker complains -+about multiple definitions -+ -+Signed-off-by: Leah Rowe <leah@libreboot.org> -+--- -+ source/compiler/aslcompiler.l | 1 - -+ source/compiler/dtparser.l | 2 +- -+ source/compiler/prparser.l | 2 +- -+ source/tools/acpiexec/aemain.c | 1 - -+ 4 files changed, 2 insertions(+), 4 deletions(-) -+ -+diff --git a/source/compiler/aslcompiler.l b/source/compiler/aslcompiler.l -+index 1949b32..a24f028 100644 -+--- a/source/compiler/aslcompiler.l -++++ b/source/compiler/aslcompiler.l -+@@ -48,7 +48,6 @@ -+ -+ #include <stdlib.h> -+ #include <string.h> -+-YYSTYPE AslCompilerlval; -+ -+ /* -+ * Generation: Use the following command line: -+diff --git a/source/compiler/dtparser.l b/source/compiler/dtparser.l -+index 6517e52..d35181c 100644 -+--- a/source/compiler/dtparser.l -++++ b/source/compiler/dtparser.l -+@@ -100,7 +100,7 @@ NewLine [\n] -+ /* -+ * Local support functions -+ */ -+-YY_BUFFER_STATE LexBuffer; -++static YY_BUFFER_STATE LexBuffer; -+ -+ /****************************************************************************** -+ * -+diff --git a/source/compiler/prparser.l b/source/compiler/prparser.l -+index bcdef14..5a1b848 100644 -+--- a/source/compiler/prparser.l -++++ b/source/compiler/prparser.l -+@@ -116,7 +116,7 @@ Identifier [a-zA-Z][0-9a-zA-Z]* -+ /* -+ * Local support functions -+ */ -+-YY_BUFFER_STATE LexBuffer; -++static YY_BUFFER_STATE LexBuffer; -+ -+ -+ /****************************************************************************** -+diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c -+index 58640dd..cd0add6 100644 -+--- a/source/tools/acpiexec/aemain.c -++++ b/source/tools/acpiexec/aemain.c -+@@ -84,7 +84,6 @@ BOOLEAN AcpiGbl_VerboseHandlers = FALSE; -+ UINT8 AcpiGbl_RegionFillValue = 0; -+ BOOLEAN AcpiGbl_IgnoreErrors = FALSE; -+ BOOLEAN AcpiGbl_AbortLoopOnTimeout = FALSE; -+-BOOLEAN AcpiGbl_DbOpt_NoRegionSupport = FALSE; -+ UINT8 AcpiGbl_UseHwReducedFadt = FALSE; -+ BOOLEAN AcpiGbl_DoInterfaceTests = FALSE; -+ BOOLEAN AcpiGbl_LoadTestTables = FALSE; -+-- -+2.40.1 -+ --- -2.40.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch b/config/module/coreboot/fam15h_cb411/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch deleted file mode 100644 index b48e88cd..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ba94a3f27a26d181291b5908bdd627be375eb606 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 16 Jul 2023 00:44:22 +0100 -Subject: [PATCH 1/1] coreboot/fam15h: use new upstream for acpica - -the original upstream died - -i decided to host it myself, on libreboot rsync, -for use by mirrors. - -this change is not necessary on other coreboot trees, -which adhere to new coreboot policy (newer coreboot -pulls acpica from github, which is fairly reliable) - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/buildgcc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index b75b90a877..e3efa722f1 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -73,7 +73,7 @@ MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" - GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" - BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" - GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" --IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" -+IASL_ARCHIVE="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix2-${IASL_VERSION}.tar.gz" - PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" - EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" - # CLANG toolchain archive locations --- -2.40.1 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch b/config/module/coreboot/fam15h_cb411/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch deleted file mode 100644 index bee2d89a..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5358f0adc28bb1300162aa6bcfaa45aea69970d0 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 5 Nov 2023 23:08:43 +0000 -Subject: [PATCH 1/1] use mirrorservire.org for gcc downloads - -the gnu.org 302 redirect often fails - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/buildgcc | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index 4b838208bb..438fb5a59f 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -67,12 +67,12 @@ NASM_VERSION=2.14.02 - # These are sanitized by the jenkins toolchain test builder, so if - # a completely new URL is added here, it probably needs to be added - # to the jenkins build as well, or the builder won't download it. --GMP_ARCHIVE="https://ftpmirror.gnu.org/gmp/gmp-${GMP_VERSION}.tar.xz" --MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz" --MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" --GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" --BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" --GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" -+GMP_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz" -+MPFR_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.xz" -+MPC_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz" -+GCC_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" -+BINUTILS_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.xz" -+GDB_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gdb/gdb-${GDB_VERSION}.tar.xz" - IASL_ARCHIVE="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix2-${IASL_VERSION}.tar.gz" - PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" - EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" -@@ -81,7 +81,7 @@ LLVM_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/llvm-${CLANG_VERSION}.s - CFE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/cfe-${CLANG_VERSION}.src.tar.xz" - CRT_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz" - CTE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz" --MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-${MAKE_VERSION}.tar.bz2" -+MAKE_ARCHIVE="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/make/make-${MAKE_VERSION}.tar.bz2" - CMAKE_ARCHIVE="https://cmake.org/files/v3.15/cmake-${CMAKE_VERSION}.tar.gz" - NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2" - --- -2.39.2 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch b/config/module/coreboot/fam15h_cb411/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch deleted file mode 100644 index c767968b..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5ec265deac0da077c9b1e23fc52abe1b5f0696b5 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sat, 13 Jan 2024 14:57:46 +0000 -Subject: [PATCH 1/1] buildgcc: don't treat binutil warnings as errors - -binutils 2.32 has too many build warnings on modern toolchains, -and newer gcc versions are much more pedantic about warnings, -treating them as errors by default. - -instead of patching binutils like before, just let the warnings -persist. the warnings are benign. a user on gnuboot irc had serious -issues building binutils 2.32 specifically, on current gentoo as -of 13 January 2024. this patch mitigates those warning messages. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/buildgcc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index 505cd7484c..6f1953e68d 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -719,7 +719,7 @@ build_BINUTILS() { - --disable-werror --disable-nls --enable-lto --enable-gold \ - --enable-interwork --enable-multilib \ - --enable-plugins --enable-multilibs \ -- CFLAGS="$HOSTCFLAGS" \ -+ CFLAGS="$HOSTCFLAGS -Wno-error -w" \ - CXXFLAGS="$HOSTCFLAGS" \ - || touch .failed - # shellcheck disable=SC2086 --- -2.39.2 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch b/config/module/coreboot/fam15h_cb411/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch deleted file mode 100644 index b08c9edf..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 281151d85240bd8a60545b6415e0f44ce6a2af33 Mon Sep 17 00:00:00 2001 -From: Alper Nebi Yasak <alpernebiyasak@gmail.com> -Date: Tue, 29 Apr 2025 17:31:13 +0300 -Subject: [PATCH] WIP: Fix build with GCC 15 as host compiler - -GCC 15 now considers the unterminated-string-initialization warning as -part of -Werror by default. Coreboot compiles host utilities with the -system compiler, which results in getting this error in some files. - -Mark a hexadecimal translation table in cbfstool code as "nonstring" to -avoid the warning-turned-error. - -The bios log prefixes are non-null-terminated as well, but I couldn't -figure out how to mark them as non-strings. Temporarily disable the -warning with a pragma to avoid the error. That pragma causes an error on -GCC 14, so disable pragma warnings along with it to avoid that as well. - -Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> ---- - util/cbfstool/common.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c -index 7154bc9d5425..cb08c9e8ec11 100644 ---- a/util/cbfstool/common.c -+++ b/util/cbfstool/common.c -@@ -192,7 +192,7 @@ uint64_t intfiletype(const char *name) - - char *bintohex(uint8_t *data, size_t len) - { -- static const char translate[16] = "0123456789abcdef"; -+ static const char translate[16] __attribute__((__nonstring__)) = "0123456789abcdef"; - - char *result = malloc(len * 2 + 1); - if (result == NULL) - --- -2.49.0 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0014-util-romcc-Fix-build-with-GCC-15.patch b/config/module/coreboot/fam15h_cb411/patches/0014-util-romcc-Fix-build-with-GCC-15.patch deleted file mode 100644 index d9de94c6..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0014-util-romcc-Fix-build-with-GCC-15.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 74dc3c0a4603bc635c8bc5e95490cdf168af5f41 Mon Sep 17 00:00:00 2001 -From: Alper Nebi Yasak <alpernebiyasak@gmail.com> -Date: Tue, 29 Apr 2025 19:46:14 +0300 -Subject: [PATCH] util/romcc: Fix build with GCC 15 - -With GCC 15, we get build errors complaining bool is a reserved keyword, -so cannot be used as a function name. Rename our bool() to bool_(). - -Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> ---- - util/romcc/romcc.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c -index 378bfc50f290..b375e0fc83cb 100644 ---- a/util/romcc/romcc.c -+++ b/util/romcc/romcc.c -@@ -7137,7 +7137,7 @@ static void integral(struct compile_state *state, struct triple *def) - } - - --static void bool(struct compile_state *state, struct triple *def) -+static void bool_(struct compile_state *state, struct triple *def) - { - if (!TYPE_ARITHMETIC(def->type->type) && - ((def->type->type & TYPE_MASK) != TYPE_POINTER)) { -@@ -7705,7 +7705,7 @@ static struct triple *mkcond_expr( - struct triple *def, *val, *var, *jmp1, *jmp2, *top, *mid, *end; - struct type *result_type; - unsigned int left_type, right_type; -- bool(state, test); -+ bool_(state, test); - left_type = left->type->type; - right_type = right->type->type; - result_type = 0; -@@ -11036,7 +11036,7 @@ static struct triple *unary_expr(struct compile_state *state) - case TOK_BANG: - eat(state, TOK_BANG); - right = read_expr(state, cast_expr(state)); -- bool(state, right); -+ bool_(state, right); - def = lfalse_expr(state, right); - break; - case TOK_SIZEOF: -@@ -11363,10 +11363,10 @@ static struct triple *land_expr(struct compile_state *state) - while(peek(state) == TOK_LOGAND) { - struct triple *left, *right; - left = read_expr(state, def); -- bool(state, left); -+ bool_(state, left); - eat(state, TOK_LOGAND); - right = read_expr(state, or_expr(state)); -- bool(state, right); -+ bool_(state, right); - - def = mkland_expr(state, - ltrue_expr(state, left), -@@ -11382,10 +11382,10 @@ static struct triple *lor_expr(struct compile_state *state) - while(peek(state) == TOK_LOGOR) { - struct triple *left, *right; - left = read_expr(state, def); -- bool(state, left); -+ bool_(state, left); - eat(state, TOK_LOGOR); - right = read_expr(state, land_expr(state)); -- bool(state, right); -+ bool_(state, right); - - def = mklor_expr(state, - ltrue_expr(state, left), -@@ -11400,7 +11400,7 @@ static struct triple *conditional_expr(struct compile_state *state) - def = lor_expr(state); - if (peek(state) == TOK_QUEST) { - struct triple *test, *left, *right; -- bool(state, def); -+ bool_(state, def); - test = ltrue_expr(state, read_expr(state, def)); - eat(state, TOK_QUEST); - left = read_expr(state, expr(state)); -@@ -11676,7 +11676,7 @@ static void if_statement(struct compile_state *state, struct triple *first) - eat(state, TOK_IF); - eat(state, TOK_LPAREN); - test = expr(state); -- bool(state, test); -+ bool_(state, test); - /* Cleanup and invert the test */ - test = lfalse_expr(state, read_expr(state, test)); - eat(state, TOK_RPAREN); -@@ -11719,7 +11719,7 @@ static void for_statement(struct compile_state *state, struct triple *first) - eat(state, TOK_SEMI); - if (peek(state) != TOK_SEMI) { - test = expr(state); -- bool(state, test); -+ bool_(state, test); - test = ltrue_expr(state, read_expr(state, test)); - } - eat(state, TOK_SEMI); -@@ -11767,7 +11767,7 @@ static void while_statement(struct compile_state *state, struct triple *first) - eat(state, TOK_WHILE); - eat(state, TOK_LPAREN); - test = expr(state); -- bool(state, test); -+ bool_(state, test); - test = ltrue_expr(state, read_expr(state, test)); - eat(state, TOK_RPAREN); - /* Generate the needed pieces */ -@@ -11818,7 +11818,7 @@ static void do_statement(struct compile_state *state, struct triple *first) - eat(state, TOK_WHILE); - eat(state, TOK_LPAREN); - test = read_expr(state, expr(state)); -- bool(state, test); -+ bool_(state, test); - eat(state, TOK_RPAREN); - eat(state, TOK_SEMI); - /* Thread the pieces together */ - --- -2.49.0 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0015-gmp-gcc15-patch.patch b/config/module/coreboot/fam15h_cb411/patches/0015-gmp-gcc15-patch.patch deleted file mode 100644 index 40ea7c14..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0015-gmp-gcc15-patch.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8663b2a75d69aa241f86dd6e813232343a05b609 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Tue, 29 Apr 2025 21:26:25 +0100 -Subject: [PATCH 1/1] gmp gcc15 patch - -https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - ...include.m4-fix-std-c23-build-failure.patch | 43 +++++++++++++++++++ - 1 file changed, 43 insertions(+) - create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch - -diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch -new file mode 100644 -index 0000000000..adb66c6043 ---- /dev/null -+++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch -@@ -0,0 +1,43 @@ -+From 7d4aa08224b53054754b8ee6fd61a4297ac47119 Mon Sep 17 00:00:00 2001 -+From: Rudi Heitbaum <rudi@heitbaum.com> -+Date: Wed, 22 Jan 2025 02:34:09 +0100 -+Subject: [PATCH 1/1] acinclude.m4: fix -std=c23 build failure -+ -+Add prototype to configure test function as c23 removes unprototyped -+functions. -+ -+gcc-15 switched to -std=c23 by default: -+ -+ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 -+ -+As a result `configure` fails with: -+ conftest.c: In function 'f': -+ conftest.c:12:48: error: too many arguments to function 'g'; expected 0, have 6 -+ 12 | for(i=0;i<1;i++){if(e(got,got,9,d[i].n)==0)h();g(i,d[i].src,d[i].n,got,d[i].want,9);if(d[i].n)h();}} -+ | ^ ~ -+ conftest.c:7:6: note: declared here -+ 7 | void g(){} -+ | ^ -+ -+Link: https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html -+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> -+--- -+ acinclude.m4 | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/acinclude.m4 b/acinclude.m4 -+index 3c3ecf5..3a226fd 100644 -+--- a/acinclude.m4 -++++ b/acinclude.m4 -+@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], -+ -+ #if defined (__GNUC__) && ! defined (__cplusplus) -+ typedef unsigned long long t1;typedef t1*t2; -+-void g(){} -++void g(int,const t1 *,t1,t1 *,const t1 *,int){} -+ void h(){} -+ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) -+ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} -+-- -+2.39.5 -+ --- -2.39.5 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch b/config/module/coreboot/fam15h_cb411/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch deleted file mode 100644 index 1287a02d..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8c3a1163eb24a608ad14747cd40169fb5a41d4f9 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Tue, 29 Apr 2025 23:18:56 +0100 -Subject: [PATCH 1/1] further fix for std=c23 on gmp with host gcc-15 - -the fix had to be applied in the configure file, so that -the correct function call is generated in conftest.c - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - ...e.m4-fix-std-c23-build-failure-extra.patch | 32 +++++++++++++++++++ - 1 file changed, 32 insertions(+) - create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch - -diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch -new file mode 100644 -index 0000000000..40569b27d8 ---- /dev/null -+++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch -@@ -0,0 +1,32 @@ -+From 6316016cfe6834b6d3242e7e088b7d2af91ada22 Mon Sep 17 00:00:00 2001 -+From: Leah Rowe <leah@libreboot.org> -+Date: Tue, 29 Apr 2025 23:16:51 +0100 -+Subject: [PATCH 1/1] further -std=23 gcc-15 fix for gmp -+ -+the previously merged revision was correct, but -+applied in the wrong place. the conftest.c file -+was being generated by configure, in this place. -+ -+this should fix build errors now, on gcc-15. -+ -+Signed-off-by: Leah Rowe <leah@libreboot.org> -+--- -+ configure | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/configure b/configure -+index 12ddffd..8b07818 100755 -+--- a/configure -++++ b/configure -+@@ -6458,7 +6458,7 @@ if test "$gmp_prog_cc_works" = yes; then -+ -+ #if defined (__GNUC__) && ! defined (__cplusplus) -+ typedef unsigned long long t1;typedef t1*t2; -+-void g(){} -++void g(int,const t1 *,t1,t1 *,const t1 *,int){} -+ void h(){} -+ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) -+ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} -+-- -+2.39.5 -+ --- -2.39.5 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0017-xgcc-update-nasm-to-2.16.03.patch b/config/module/coreboot/fam15h_cb411/patches/0017-xgcc-update-nasm-to-2.16.03.patch deleted file mode 100644 index 8dc52ac9..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0017-xgcc-update-nasm-to-2.16.03.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0d639c485bdf136e4c5ac7af81fc12da3f21bc46 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Wed, 30 Apr 2025 04:07:31 +0100 -Subject: [PATCH 1/1] xgcc: update nasm to 2.16.03 - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/buildgcc | 2 +- - util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum | 1 - - util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum | 1 + - 3 files changed, 2 insertions(+), 2 deletions(-) - delete mode 100644 util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum - create mode 100644 util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index 0ad1980104..2d48ff038e 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -61,7 +61,7 @@ EXPAT_VERSION=2.2.7 - CLANG_VERSION=8.0.0 - MAKE_VERSION=4.2.1 - CMAKE_VERSION=3.15.3 --NASM_VERSION=2.14.02 -+NASM_VERSION=2.16.03 - - # GCC toolchain archive locations - # These are sanitized by the jenkins toolchain test builder, so if -diff --git a/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum b/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum -deleted file mode 100644 -index f3b9de9d29..0000000000 ---- a/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum -+++ /dev/null -@@ -1 +0,0 @@ --fe098ee4dc9c4c983696c4948e64b23e4098b92b tarballs/nasm-2.14.02.tar.bz2 -diff --git a/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum b/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum -new file mode 100644 -index 0000000000..9ca23fb0c4 ---- /dev/null -+++ b/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum -@@ -0,0 +1 @@ -+c63080347a5c1c8904456fe6c680b722558383b4 tarballs/nasm-2.16.03.tar.bz2 --- -2.39.5 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0018-fix-arch-linux-build-error.patch b/config/module/coreboot/fam15h_cb411/patches/0018-fix-arch-linux-build-error.patch deleted file mode 100644 index d712f444..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0018-fix-arch-linux-build-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0e6a5b0e82309715683ce3033dc34897852827e5 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Wed, 1 Apr 2026 08:25:07 +0100 -Subject: [PATCH 1/1] fix arch linux build error - -fixes cbfstool builds on arch linux on this old coreboot - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - src/commonlib/include/commonlib/helpers.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/commonlib/include/commonlib/helpers.h b/src/commonlib/include/commonlib/helpers.h -index ca3b3c58f9..e28b5c4c37 100644 ---- a/src/commonlib/include/commonlib/helpers.h -+++ b/src/commonlib/include/commonlib/helpers.h -@@ -133,10 +133,6 @@ - /* Calculate size of structure member. */ - #define member_size(type, member) (sizeof(((type *)0)->member)) - --#ifndef __unused --#define __unused __attribute__((unused)) --#endif -- - #ifndef alloca - #define alloca(x) __builtin_alloca(x) - #endif --- -2.47.3 - diff --git a/config/module/coreboot/fam15h_cb411/patches/0019-fix-gcc-error-with-__unused.patch b/config/module/coreboot/fam15h_cb411/patches/0019-fix-gcc-error-with-__unused.patch deleted file mode 100644 index f6a2e643..00000000 --- a/config/module/coreboot/fam15h_cb411/patches/0019-fix-gcc-error-with-__unused.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 330177da40df12813d6e45c9cdb6285dcbff8b59 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Mon, 3 Aug 2026 22:22:39 +0100 -Subject: [PATCH 1/1] fix gcc error with __unused - -just discard it explicitly. - -really now, this is better. it's what i do. - -(void)foo; - -then gcc won't blow up. fixes building on my debian machine. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - src/commonlib/region.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/commonlib/region.c b/src/commonlib/region.c -index 4a7e285747..b016600da9 100644 ---- a/src/commonlib/region.c -+++ b/src/commonlib/region.c -@@ -229,18 +229,23 @@ void xlate_region_device_rw_init(struct xlate_region_device *xdev, - } - - static void *mdev_mmap(const struct region_device *rd, size_t offset, -- size_t size __unused) -+ size_t size) - { - const struct mem_region_device *mdev; - -+ (void)size; -+ - mdev = container_of(rd, __typeof__(*mdev), rdev); - - return &mdev->base[offset]; - } - --static int mdev_munmap(const struct region_device *rd __unused, -- void *mapping __unused) -+static int mdev_munmap(const struct region_device *rd, -+ void *mapping) - { -+ (void)mapping; -+ (void)rd; -+ - return 0; - } - --- -2.47.3 - diff --git a/config/module/coreboot/fam15h_cb411/target.cfg b/config/module/coreboot/fam15h_cb411/target.cfg deleted file mode 100644 index 41802d8a..00000000 --- a/config/module/coreboot/fam15h_cb411/target.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" - -tree="fam15h_cb411" - -xlang="c" # disable use of gnat on this tree diff --git a/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode b/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode index b538c0f9..7f32d3df 100644 --- a/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode +++ b/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode @@ -110,6 +110,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_ASUS_AM1I_A is not set +# CONFIG_BOARD_ASUS_CROSSHAIR_V_FORMULA_Z is not set # CONFIG_BOARD_ASUS_F2A85_M is not set # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set # CONFIG_BOARD_ASUS_F2A85_M_LE is not set @@ -138,13 +139,17 @@ CONFIG_BOARD_ASUS_KFSN4_DRE=y # CONFIG_BOARD_ASUS_P8H61_M_LX is not set # CONFIG_BOARD_ASUS_P8H61_M_PRO is not set # CONFIG_BOARD_ASUS_P8Z77_M_PRO is not set +# CONFIG_BOARD_ASUS_RAPTOR_KCMA_D8 is not set +# CONFIG_BOARD_ASUS_RAPTOR_KGPE_D16 is not set +# CONFIG_BOARD_ASUS_SABERTOOTH_990FX_R2 is not set +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_POST_IO=y CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kfsn4-dre/bootblock.c" CONFIG_DCACHE_RAM_BASE=0xc4000 CONFIG_DCACHE_RAM_SIZE=0x0c000 -CONFIG_MAX_REBOOT_CNT=10 CONFIG_CK804_PCI_E_X=1 CONFIG_CK804_PCIE_PME_WAKE=y +CONFIG_MAX_REBOOT_CNT=10 CONFIG_OVERRIDE_DEVICETREE="" CONFIG_FMDFILE="" # CONFIG_VBOOT is not set @@ -319,6 +324,8 @@ CONFIG_DIMM_REGISTERED=y CONFIG_LIMIT_HT_DOWN_WIDTH_16=y # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set CONFIG_LIMIT_HT_UP_WIDTH_16=y +# CONFIG_AMD_NB_CIMX is not set +# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set # CONFIG_NORTHBRIDGE_AMD_PI is not set # @@ -391,7 +398,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set # CONFIG_HPET_ADDRESS_OVERRIDE is not set -CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_ID_SECTION_OFFSET=0x80 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set @@ -508,6 +514,7 @@ CONFIG_VGA=y # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set +# CONFIG_MAINBOARD_HAS_SPI_TPM is not set # CONFIG_DRIVER_TI_TPS65090 is not set # CONFIG_DRIVERS_TI_TPS65913 is not set # CONFIG_DRIVERS_TI_TPS65913_RTC is not set @@ -633,6 +640,7 @@ 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_TINT_SECONDARY_PAYLOAD is not set diff --git a/config/module/coreboot/kfsn4_dre_1mb/target.cfg b/config/module/coreboot/kfsn4_dre_1mb/target.cfg index 022356d6..46aee534 100644 --- a/config/module/coreboot/kfsn4_dre_1mb/target.cfg +++ b/config/module/coreboot/kfsn4_dre_1mb/target.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later -tree="fam15h_cb411" +tree="fam15h_15h" xarch="i386-elf" payload_seabios="y" payload_memtest="y" diff --git a/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode b/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode index a5329039..a6968856 100644 --- a/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode +++ b/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode @@ -110,6 +110,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_ASUS_AM1I_A is not set +# CONFIG_BOARD_ASUS_CROSSHAIR_V_FORMULA_Z is not set # CONFIG_BOARD_ASUS_F2A85_M is not set # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set # CONFIG_BOARD_ASUS_F2A85_M_LE is not set @@ -138,13 +139,17 @@ CONFIG_BOARD_ASUS_KFSN4_DRE=y # CONFIG_BOARD_ASUS_P8H61_M_LX is not set # CONFIG_BOARD_ASUS_P8H61_M_PRO is not set # CONFIG_BOARD_ASUS_P8Z77_M_PRO is not set +# CONFIG_BOARD_ASUS_RAPTOR_KCMA_D8 is not set +# CONFIG_BOARD_ASUS_RAPTOR_KGPE_D16 is not set +# CONFIG_BOARD_ASUS_SABERTOOTH_990FX_R2 is not set +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_POST_IO=y CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kfsn4-dre/bootblock.c" CONFIG_DCACHE_RAM_BASE=0xc4000 CONFIG_DCACHE_RAM_SIZE=0x0c000 -CONFIG_MAX_REBOOT_CNT=10 CONFIG_CK804_PCI_E_X=1 CONFIG_CK804_PCIE_PME_WAKE=y +CONFIG_MAX_REBOOT_CNT=10 CONFIG_OVERRIDE_DEVICETREE="" CONFIG_FMDFILE="" # CONFIG_VBOOT is not set @@ -319,6 +324,8 @@ CONFIG_DIMM_REGISTERED=y CONFIG_LIMIT_HT_DOWN_WIDTH_16=y # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set CONFIG_LIMIT_HT_UP_WIDTH_16=y +# CONFIG_AMD_NB_CIMX is not set +# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set # CONFIG_NORTHBRIDGE_AMD_PI is not set # @@ -391,7 +398,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set # CONFIG_HPET_ADDRESS_OVERRIDE is not set -CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_ID_SECTION_OFFSET=0x80 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set @@ -508,6 +514,7 @@ CONFIG_VGA=y # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set +# CONFIG_MAINBOARD_HAS_SPI_TPM is not set # CONFIG_DRIVER_TI_TPS65090 is not set # CONFIG_DRIVERS_TI_TPS65913 is not set # CONFIG_DRIVERS_TI_TPS65913_RTC is not set @@ -633,6 +640,7 @@ 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_TINT_SECONDARY_PAYLOAD is not set diff --git a/config/module/coreboot/kfsn4_dre_2mb/target.cfg b/config/module/coreboot/kfsn4_dre_2mb/target.cfg index 4e691142..03ebe64d 100644 --- a/config/module/coreboot/kfsn4_dre_2mb/target.cfg +++ b/config/module/coreboot/kfsn4_dre_2mb/target.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later -tree="fam15h_cb411" +tree="fam15h_15h" xarch="i386-elf" payload_seabios="y" payload_grub="y" diff --git a/config/submodule/coreboot/fam15h_cb411/acpica-unix2-20190703.tar.gz/module.cfg b/config/submodule/coreboot/fam15h_cb411/acpica-unix2-20190703.tar.gz/module.cfg deleted file mode 100644 index b8365f7c..00000000 --- a/config/submodule/coreboot/fam15h_cb411/acpica-unix2-20190703.tar.gz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix2-20190703.tar.gz" -subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix2-20190703.tar.gz" -subhash="8445a6d354ce3bcbfb5159f4ec0312b1e910c0b1b2033a2300f892e4ac580abab4e3f5b4ded379f0036299359d307330511ab7053678cfd9031d7df4c365f555" diff --git a/config/submodule/coreboot/fam15h_cb411/binutils-2.32.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_cb411/binutils-2.32.tar.xz/module.cfg deleted file mode 100644 index 3f03f64e..00000000 --- a/config/submodule/coreboot/fam15h_cb411/binutils-2.32.tar.xz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz" -subcurl_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.32.tar.xz" -subhash="d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a" diff --git a/config/submodule/coreboot/fam15h_cb411/blobs/module.cfg b/config/submodule/coreboot/fam15h_cb411/blobs/module.cfg deleted file mode 100644 index 3c34302c..00000000 --- a/config/submodule/coreboot/fam15h_cb411/blobs/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subgit="https://review.coreboot.org/blobs.git" -subgit_bkup="https://github.com/coreboot/blobs" -subhash="034b27818450428f70aa9316c8bd0d65bacd8ee8" diff --git a/config/submodule/coreboot/fam15h_cb411/gcc-8.3.0.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_cb411/gcc-8.3.0.tar.xz/module.cfg deleted file mode 100644 index ce21c98b..00000000 --- a/config/submodule/coreboot/fam15h_cb411/gcc-8.3.0.tar.xz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz" -subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz" -subhash="1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802" diff --git a/config/submodule/coreboot/fam15h_cb411/gmp-6.1.2.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_cb411/gmp-6.1.2.tar.xz/module.cfg deleted file mode 100644 index a46b9b7c..00000000 --- a/config/submodule/coreboot/fam15h_cb411/gmp-6.1.2.tar.xz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz" -subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.1.2.tar.xz" -subhash="9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6" diff --git a/config/submodule/coreboot/fam15h_cb411/module.list b/config/submodule/coreboot/fam15h_cb411/module.list deleted file mode 100644 index 00befad9..00000000 --- a/config/submodule/coreboot/fam15h_cb411/module.list +++ /dev/null @@ -1,9 +0,0 @@ -3rdparty/blobs -3rdparty/vboot -util/crossgcc/tarballs/acpica-unix2-20190703.tar.gz -util/crossgcc/tarballs/binutils-2.32.tar.xz -util/crossgcc/tarballs/gcc-8.3.0.tar.xz -util/crossgcc/tarballs/gmp-6.1.2.tar.xz -util/crossgcc/tarballs/mpc-1.1.0.tar.gz -util/crossgcc/tarballs/mpfr-4.0.2.tar.xz -util/crossgcc/tarballs/nasm-2.16.03.tar.bz2 diff --git a/config/submodule/coreboot/fam15h_cb411/mpc-1.1.0.tar.gz/module.cfg b/config/submodule/coreboot/fam15h_cb411/mpc-1.1.0.tar.gz/module.cfg deleted file mode 100644 index 13a66a87..00000000 --- a/config/submodule/coreboot/fam15h_cb411/mpc-1.1.0.tar.gz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz" -subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.1.0.tar.gz" -subhash="72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628" diff --git a/config/submodule/coreboot/fam15h_cb411/mpfr-4.0.2.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_cb411/mpfr-4.0.2.tar.xz/module.cfg deleted file mode 100644 index f2a4f0fe..00000000 --- a/config/submodule/coreboot/fam15h_cb411/mpfr-4.0.2.tar.xz/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz" -subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.0.2.tar.xz" -subhash="d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88" diff --git a/config/submodule/coreboot/fam15h_cb411/nasm-2.16.03.tar.bz2/module.cfg b/config/submodule/coreboot/fam15h_cb411/nasm-2.16.03.tar.bz2/module.cfg deleted file mode 100644 index bc486e80..00000000 --- a/config/submodule/coreboot/fam15h_cb411/nasm-2.16.03.tar.bz2/module.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -subcurl="https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2" -subcurl_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.16.03.tar.bz2" -subhash="f28445d368debdf44219cc57df33800a8c0e49186cd60836d4adfec7700d53b801d34aa9fc9bfda74169843f33a1e8b465e11292582eb968bb9c3a26f54dd172" diff --git a/config/submodule/coreboot/fam15h_cb411/vboot/module.cfg b/config/submodule/coreboot/fam15h_cb411/vboot/module.cfg deleted file mode 100644 index a3a8f21b..00000000 --- a/config/submodule/coreboot/fam15h_cb411/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="ecdca931ae0637d1a9498f64862939bd5bb99e0b" diff --git a/config/submodule/coreboot/fam15h_cb411/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch b/config/submodule/coreboot/fam15h_cb411/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch deleted file mode 100644 index 1ac41de6..00000000 --- a/config/submodule/coreboot/fam15h_cb411/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 - |