diff options
Diffstat (limited to 'config/submodule/coreboot/default/vboot')
3 files changed, 51 insertions, 31 deletions
diff --git a/config/submodule/coreboot/default/vboot/module.cfg b/config/submodule/coreboot/default/vboot/module.cfg index 8b4e15de..0ccf6548 100644 --- a/config/submodule/coreboot/default/vboot/module.cfg +++ b/config/submodule/coreboot/default/vboot/module.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later -subgit="https://review.coreboot.org/vboot.git" -subgit_bkup="https://github.com/coreboot/vboot" -subhash="3f94e2c7ed58c4e67d6e7dc6052ec615dbbb9bb4" +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/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 + diff --git a/config/submodule/coreboot/default/vboot/patches/0002-lib-cbfstool-fix-build-error-on-newer-hostcc.patch b/config/submodule/coreboot/default/vboot/patches/0002-lib-cbfstool-fix-build-error-on-newer-hostcc.patch deleted file mode 100644 index 6d5ba873..00000000 --- a/config/submodule/coreboot/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 - |