diff options
Diffstat (limited to 'config/submodule/coreboot/default')
23 files changed, 612 insertions, 0 deletions
diff --git a/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg b/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg new file mode 100644 index 00000000..0ef86b38 --- /dev/null +++ b/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix-20251212.tar.gz" +subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix-20251212.tar.gz" +subhash="fcb2de18917d463ae0229bcaf37528366084cbf669e02acf7862ff4488a40ddcf24499410549a209b13e944249512e32454a3dbf039193bac6d8b012971ad69d" diff --git a/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg new file mode 100644 index 00000000..d940c8b5 --- /dev/null +++ b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/arm-trusted-firmware.git" +subgit="https://github.com/coreboot/arm-trusted-firmware" +subhash="9109143417b24337d39a2a9583828a44996f8aac" diff --git a/config/submodule/coreboot/default/arm-trusted-firmware/patches/0001-disable-werror.patch b/config/submodule/coreboot/default/arm-trusted-firmware/patches/0001-disable-werror.patch new file mode 100644 index 00000000..5554447b --- /dev/null +++ b/config/submodule/coreboot/default/arm-trusted-firmware/patches/0001-disable-werror.patch @@ -0,0 +1,110 @@ +From 5b214f3e1e3919c495d45c6f52884e323a987037 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Thu, 23 Apr 2026 20:45:33 +0100 +Subject: [PATCH 1/1] disable werror + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + Makefile | 2 +- + tools/amlogic/Makefile | 2 +- + tools/fiptool/Makefile | 2 +- + tools/marvell/doimage/Makefile | 2 +- + tools/nxp/create_pbl/Makefile | 2 +- + tools/sptool/Makefile | 2 +- + tools/stm32image/Makefile | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 530e6e0f5..b6f504d7c 100644 +--- a/Makefile ++++ b/Makefile +@@ -274,7 +274,7 @@ WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ + endif #(Clang Warning) + + ifneq (${E},0) +- ERRORS := -Werror ++ ERRORS := + endif #(E) + + ################################################################################ +diff --git a/tools/amlogic/Makefile b/tools/amlogic/Makefile +index cdaf7e711..576cf0ce6 100644 +--- a/tools/amlogic/Makefile ++++ b/tools/amlogic/Makefile +@@ -14,7 +14,7 @@ include ${MAKE_HELPERS_DIRECTORY}toolchain.mk + PROJECT := doimage$(.exe) + OBJECTS := doimage.o + +-HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 -D_GNU_SOURCE ++HOSTCCFLAGS := -Wall -pedantic -std=c99 -D_GNU_SOURCE + + ifeq (${DEBUG},1) + HOSTCCFLAGS += -g -O0 -DDEBUG +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index a660a500e..479e72a9a 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -16,7 +16,7 @@ OBJECTS := fiptool.o tbbr_config.o + STATIC ?= 0 + + override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 +-HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 ++HOSTCCFLAGS := -Wall -pedantic -std=c99 + ifeq (${DEBUG},1) + HOSTCCFLAGS += -g -O0 -DDEBUG + else +diff --git a/tools/marvell/doimage/Makefile b/tools/marvell/doimage/Makefile +index a4f7a1d89..852830a4e 100644 +--- a/tools/marvell/doimage/Makefile ++++ b/tools/marvell/doimage/Makefile +@@ -10,7 +10,7 @@ include ../../../make_helpers/toolchain.mk + PROJECT = doimage + OBJECTS = doimage.o + +-HOSTCCFLAGS = -Wall -Werror ++HOSTCCFLAGS = -Wall + ifeq (${DEBUG},1) + HOSTCCFLAGS += -g -O0 -DDEBUG + else +diff --git a/tools/nxp/create_pbl/Makefile b/tools/nxp/create_pbl/Makefile +index 9285b723e..57bbeaa0e 100644 +--- a/tools/nxp/create_pbl/Makefile ++++ b/tools/nxp/create_pbl/Makefile +@@ -16,7 +16,7 @@ PROJECT_2 := byte_swap$(.exe) + OBJECTS_2 := byte_swap.o + + override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 +-CFLAGS := -Wall -Werror -pedantic -std=c99 ++CFLAGS := -Wall -pedantic -std=c99 + ifeq (${DEBUG},1) + CFLAGS += -g -O0 -DDEBUG + else +diff --git a/tools/sptool/Makefile b/tools/sptool/Makefile +index f579a42eb..7a847dd3f 100644 +--- a/tools/sptool/Makefile ++++ b/tools/sptool/Makefile +@@ -14,7 +14,7 @@ PROJECT := $(notdir ${SPTOOL}) + OBJECTS := sptool.o + + override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 +-HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 ++HOSTCCFLAGS := -Wall -pedantic -std=c99 + ifeq (${DEBUG},1) + HOSTCCFLAGS += -g -O0 -DDEBUG + else +diff --git a/tools/stm32image/Makefile b/tools/stm32image/Makefile +index 64b6ccfab..600662d74 100644 +--- a/tools/stm32image/Makefile ++++ b/tools/stm32image/Makefile +@@ -12,7 +12,7 @@ include ${MAKE_HELPERS_DIRECTORY}toolchain.mk + PROJECT := stm32image$(.exe) + OBJECTS := stm32image.o + +-HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 -D_GNU_SOURCE ++HOSTCCFLAGS := -Wall -pedantic -std=c99 -D_GNU_SOURCE + + ifeq (${DEBUG},1) + HOSTCCFLAGS += -g -O0 -DDEBUG +-- +2.47.3 + diff --git a/config/submodule/coreboot/default/binutils-2.45.1.tar.xz/module.cfg b/config/submodule/coreboot/default/binutils-2.45.1.tar.xz/module.cfg new file mode 100644 index 00000000..73308537 --- /dev/null +++ b/config/submodule/coreboot/default/binutils-2.45.1.tar.xz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.45.1.tar.xz" +subcurl_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.45.1.tar.xz" +subhash="ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e" diff --git a/config/submodule/coreboot/default/cmocka/module.cfg b/config/submodule/coreboot/default/cmocka/module.cfg new file mode 100644 index 00000000..33de5a65 --- /dev/null +++ b/config/submodule/coreboot/default/cmocka/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/cmocka.git" +subgit="https://github.com/coreboot/cmocka" +subhash="8be37372097d1aa5e03b565936db7891b6180e73" diff --git a/config/submodule/coreboot/default/cmocka/patches/0001-disable-werror.patch b/config/submodule/coreboot/default/cmocka/patches/0001-disable-werror.patch new file mode 100644 index 00000000..b84e6261 --- /dev/null +++ b/config/submodule/coreboot/default/cmocka/patches/0001-disable-werror.patch @@ -0,0 +1,80 @@ +From 228447a166be2743cc377c99968cad0df1cb4909 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Thu, 23 Apr 2026 20:45:47 +0100 +Subject: [PATCH 1/1] disable werror + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + .ycm_extra_conf.py | 1 - + CompilerChecks.cmake | 23 ----------------------- + 2 files changed, 24 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..5fd39d8 100644 +--- a/CompilerChecks.cmake ++++ b/CompilerChecks.cmake +@@ -2,20 +2,6 @@ include(AddCCompilerFlag) + include(CheckCCompilerFlagSSP) + + if (UNIX) +- # +- # Check for -Werror turned on if possible +- # +- # 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) + add_c_compiler_flag("-Wall" SUPPORTED_COMPILER_FLAGS) +@@ -23,20 +9,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 +25,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/coreboot/default/fsp/module.cfg b/config/submodule/coreboot/default/fsp/module.cfg new file mode 100644 index 00000000..21d19735 --- /dev/null +++ b/config/submodule/coreboot/default/fsp/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/fsp.git" +subgit="https://github.com/coreboot/fsp" +subhash="81399b3b61479abc379c2d01362d4b6dc6f515c9" diff --git a/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg b/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg new file mode 100644 index 00000000..a75bdb57 --- /dev/null +++ b/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/fsp.git" +subgit="https://github.com/coreboot/fsp" +subhash="cc36ae2b5775fa7400cb3282680afc0f6cb37a3c" diff --git a/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg new file mode 100644 index 00000000..c9dbb8b6 --- /dev/null +++ b/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz" +subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz" +subhash="89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de" diff --git a/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg new file mode 100644 index 00000000..90466fed --- /dev/null +++ b/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz" +subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.3.0.tar.xz" +subhash="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2" diff --git a/config/submodule/coreboot/default/intel-microcode/module.cfg b/config/submodule/coreboot/default/intel-microcode/module.cfg new file mode 100644 index 00000000..12d81ec0 --- /dev/null +++ b/config/submodule/coreboot/default/intel-microcode/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/intel-microcode.git" +subgit="https://github.com/coreboot/intel-microcode" +subhash="250941fb670645d7d91f761cc63656ad3a1ec367" diff --git a/config/submodule/coreboot/default/libgfxinit/module.cfg b/config/submodule/coreboot/default/libgfxinit/module.cfg new file mode 100644 index 00000000..1b1424b6 --- /dev/null +++ b/config/submodule/coreboot/default/libgfxinit/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/libgfxinit.git" +subgit="https://github.com/coreboot/libgfxinit" +subhash="3c3828add50024e90e57d6fbe0e660d1b66302d9" diff --git a/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch b/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch new file mode 100644 index 00000000..2d248941 --- /dev/null +++ b/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch @@ -0,0 +1,42 @@ +From ba078864500de99c26b6ea7e3fdcef19bca582a7 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/1] 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 67242f2..5e970d7 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; +@@ -460,7 +462,7 @@ is + (Display => Port_Cfg.Display, + 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, + Best_Clock => Clk, + Valid => Success); + else +-- +2.39.2 + diff --git a/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch b/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch new file mode 100644 index 00000000..889218fe --- /dev/null +++ b/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch @@ -0,0 +1,38 @@ +From cbac507d93dc357a75ccc11fdda5c7ed60935538 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Sun, 13 Jul 2025 15:18:53 +0100 +Subject: [PATCH 1/1] 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 67f8ddf..0500217 100644 +--- a/common/hw-gfx-gma-display_probing.adb ++++ b/common/hw-gfx-gma-display_probing.adb +@@ -122,6 +122,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.39.5 + diff --git a/config/submodule/coreboot/default/libhwbase/module.cfg b/config/submodule/coreboot/default/libhwbase/module.cfg new file mode 100644 index 00000000..bbd88f19 --- /dev/null +++ b/config/submodule/coreboot/default/libhwbase/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/libhwbase.git" +subgit="https://github.com/coreboot/libhwbase" +subhash="584629b9f4771b7618951cec57df2ca3af9c6981" diff --git a/config/submodule/coreboot/default/libhwbase/patches/0001-disable-werror.patch b/config/submodule/coreboot/default/libhwbase/patches/0001-disable-werror.patch new file mode 100644 index 00000000..f7c423d0 --- /dev/null +++ b/config/submodule/coreboot/default/libhwbase/patches/0001-disable-werror.patch @@ -0,0 +1,26 @@ +From 215db3c92bc21d6d07d9cd6e209f45d90298fda8 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Thu, 23 Apr 2026 20:45:13 +0100 +Subject: [PATCH 1/1] disable 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 fb4c43c..58e080e 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,7 +45,7 @@ GNATBIND = $(CROSS_COMPILE)gnatbind + + GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E - 2>/dev/null | tail -1) + +-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/coreboot/default/module.list b/config/submodule/coreboot/default/module.list new file mode 100644 index 00000000..44e8ff83 --- /dev/null +++ b/config/submodule/coreboot/default/module.list @@ -0,0 +1,15 @@ +3rdparty/arm-trusted-firmware +3rdparty/fsp +3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c +3rdparty/intel-microcode +3rdparty/libgfxinit +3rdparty/libhwbase +3rdparty/vboot +3rdparty/cmocka +util/crossgcc/tarballs/binutils-2.45.1.tar.xz +util/crossgcc/tarballs/gcc-15.2.0.tar.xz +util/crossgcc/tarballs/gmp-6.3.0.tar.xz +util/crossgcc/tarballs/mpc-1.3.1.tar.gz +util/crossgcc/tarballs/mpfr-4.2.2.tar.xz +util/crossgcc/tarballs/nasm-3.01.tar.bz2 +util/crossgcc/tarballs/acpica-unix-20251212.tar.gz diff --git a/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg b/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg new file mode 100644 index 00000000..9a1ec4cb --- /dev/null +++ b/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz" +subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz" +subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97" diff --git a/config/submodule/coreboot/default/mpfr-4.2.2.tar.xz/module.cfg b/config/submodule/coreboot/default/mpfr-4.2.2.tar.xz/module.cfg new file mode 100644 index 00000000..a1eb1e54 --- /dev/null +++ b/config/submodule/coreboot/default/mpfr-4.2.2.tar.xz/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.2.2.tar.xz" +subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.2.2.tar.xz" +subhash="eb9e7f51b5385fb349cc4fba3a45ffdf0dd53be6dfc74932dc01258158a10514667960c530c47dd9dfc5aa18be2bd94859d80499844c5713710581e6ac6259a9" diff --git a/config/submodule/coreboot/default/nasm-3.01.tar.bz2/module.cfg b/config/submodule/coreboot/default/nasm-3.01.tar.bz2/module.cfg new file mode 100644 index 00000000..706a0274 --- /dev/null +++ b/config/submodule/coreboot/default/nasm-3.01.tar.bz2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subcurl="https://www.nasm.us/pub/nasm/releasebuilds/3.01/nasm-3.01.tar.bz2" +subcurl_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-3.01.tar.bz2" +subhash="541c39a1f2cf134c0afb47237af3f1eed9ebf477b012cba613bbafae45fa504153697b14b38ff6e736d6f9b7239eeca56c3151a556aa62954eff1d06e075490d" diff --git a/config/submodule/coreboot/default/vboot/module.cfg b/config/submodule/coreboot/default/vboot/module.cfg new file mode 100644 index 00000000..0ccf6548 --- /dev/null +++ b/config/submodule/coreboot/default/vboot/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit_bkup="https://review.coreboot.org/vboot.git" +subgit="https://github.com/coreboot/vboot" +subhash="5c360ef458b0a013d8a6d47724bb0fffb5accbcf" diff --git a/config/submodule/coreboot/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch b/config/submodule/coreboot/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch new file mode 100644 index 00000000..1ac41de6 --- /dev/null +++ b/config/submodule/coreboot/default/vboot/patches/0001-extract_vmlinuz.c-Fix-the-bounds-check-on-vmlinuz_he.patch @@ -0,0 +1,178 @@ +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/coreboot/default/vboot/patches/0002-disable-werror.patch b/config/submodule/coreboot/default/vboot/patches/0002-disable-werror.patch new file mode 100644 index 00000000..615e4df7 --- /dev/null +++ b/config/submodule/coreboot/default/vboot/patches/0002-disable-werror.patch @@ -0,0 +1,48 @@ +From 9ea31d19a31c4fa40e386c104286dd76d60260bb Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Thu, 23 Apr 2026 20:46:37 +0100 +Subject: [PATCH 1/1] disable werror + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + Android.bp | 1 - + Makefile | 4 ++-- + 2 files changed, 2 insertions(+), 3 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..cdc63c5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -113,7 +113,7 @@ 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 ++WERROR := + FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector + COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \ + -Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \ +@@ -127,7 +127,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) +-- +2.47.3 + |
