arm/linux-yocto: remove unused 5.15 patches and inc file
PATCH 1/4 arm/linux-yocto: remove unused 5.15 patches and inc file
--- .../recipes-kernel/linux/arm-ffa-5.15.inc | 5 -- .../Add-sec_world_id-to-struct-tee_shm.patch | 44 ---------- .../skip-unavailable-memory.patch | 85 ------------------- 3 files changed, 134 deletions(-) delete mode 100644 meta-arm/recipes-kernel/linux/arm-ffa-5.15.inc delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto-5.15/Add-sec_world_id-to-struct-tee_shm.patch delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto-5.15/skip-unavailable-memory.patch
meta-arm/recipes-kernel/linux/arm-ffa-5.15.inc deleted +0 -5
@@ -1,5 +0,0 @@ -# Include a backport kernel patch for TEE driver - -SRC_URI:append = " \ - file://Add-sec_world_id-to-struct-tee_shm.patch \ - "
meta-arm/recipes-kernel/linux/linux-yocto-5.15/Add-sec_world_id-to-struct-tee_shm.patch deleted +0 -44
44 lines not on this page · raw message
meta-arm/recipes-kernel/linux/linux-yocto-5.15/skip-unavailable-memory.patch deleted +0 -85
85 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 2/4 arm-bsp/optee: Remove unreferenced patches
--- ...ow-setting-sysroot-for-libgcc-lookup.patch | 35 ---------- ...0007-allow-setting-sysroot-for-clang.patch | 30 --------- .../files/0008-no-warn-rwx-segments.patch | 65 ------------------- .../recipes-devtools/fiptool/files/ssl.patch | 52 --------------- 4 files changed, 182 deletions(-) delete mode 100644 meta-arm-bsp/recipes-security/optee/files/0006-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/files/0007-allow-setting-sysroot-for-clang.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/files/0008-no-warn-rwx-segments.patch delete mode 100644 meta-arm/recipes-devtools/fiptool/files/ssl.patch
meta-arm-bsp/recipes-security/optee/files/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 4b2c1a31efe0c5514ae27e696e75659b55e41259 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 26 May 2020 14:38:02 -0500 -Subject: [PATCH] allow setting sysroot for libgcc lookup - -Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching -for the compiler libraries as there's no easy way to reliably pass --sysroot -otherwise. - -Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188] -Signed-off-by: Ross Burton <[email protected]> - ---- - mk/gcc.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mk/gcc.mk b/mk/gcc.mk -index adc77a24..81bfa78a 100644 ---- a/mk/gcc.mk -+++ b/mk/gcc.mk -@@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ - -print-file-name=include 2> /dev/null) - - # Get location of libgcc from gcc --libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ - -print-libgcc-file-name 2> /dev/null) --libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ -+libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ - -print-file-name=libstdc++.a 2> /dev/null) --libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ -+libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ - -print-file-name=libgcc_eh.a 2> /dev/null) - - # Define these to something to discover accidental use
meta-arm-bsp/recipes-security/optee/files/0007-allow-setting-sysroot-for-clang.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 992bed8a62c75aab034fe53d6329fa7c15cf06ee Mon Sep 17 00:00:00 2001 -From: Brett Warren <[email protected]> -Date: Wed, 23 Sep 2020 09:27:34 +0100 -Subject: [PATCH] optee: enable clang support - -When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used -to provide a sysroot wasn't included, which results in not locating -compiler-rt. This is mitigated by including the variable as ammended. - -Upstream-Status: Pending -ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701 -Signed-off-by: Brett Warren <[email protected]> - ---- - mk/clang.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk/clang.mk b/mk/clang.mk -index 0f48c836..47465523 100644 ---- a/mk/clang.mk -+++ b/mk/clang.mk -@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \ - - # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of - # libgcc for clang --libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ - -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null) - - # Core ASLR relies on the executable being ready to run from its preferred load
meta-arm-bsp/recipes-security/optee/files/0008-no-warn-rwx-segments.patch deleted +0 -65
65 lines not on this page · raw message
meta-arm/recipes-devtools/fiptool/files/ssl.patch deleted +0 -52
52 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 3/4 CI: add debug yml file for ease of use
In reply to Jon MasonThere are cases where a developer might want to enable things, like debug-tweaks, which are useful in their testing but not something we would want in a production environment. Create a file where these can be added without affecting other things.
--- ci/debug.yml | 7 +++++++ ci/testimage.yml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 ci/debug.yml
ci/debug.yml new file +7 -0
@@ -0,0 +1,7 @@ +header: + version: 11 + +# Add universally helpful features when testing boards +local_conf_header: + debug: | + EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
ci/testimage.yml +2 -1
@@ -1,9 +1,10 @@ header: version: 11 + includes: + - ci/debug.yml local_conf_header: testimage: | - EXTRA_IMAGE_FEATURES:append = " debug-tweaks" IMAGE_CLASSES += "testimage" TESTIMAGE_AUTO = "1" kvm: |
Signature · 1 line
2.30.2
PATCH 4/4 arm/linux-yocto: add gcc 13 gimple backport patch
In reply to Jon MasonIssue when building the kernel on FVP (and probably all aarch64 platforms) with GCC 13 on the 6.1 kernel (and possibly others). Backport the upstream fix.
--- ...eorganize-gimple-includes-for-GCC-13.patch | 47 +++++++++++++++++++ .../linux/linux-yocto%.bbappend | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
meta-arm/recipes-kernel/linux/files/aarch64/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch new file +47 -0
@@ -0,0 +1,47 @@ +From e6a71160cc145e18ab45195abf89884112e02dfb Mon Sep 17 00:00:00 2001 +From: Kees Cook <[email protected]> +Date: Wed, 18 Jan 2023 12:21:35 -0800 +Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13 + +The gimple-iterator.h header must be included before gimple-fold.h +starting with GCC 13. Reorganize gimple headers to work for all GCC +versions. + +Reported-by: Palmer Dabbelt <[email protected]> +Acked-by: Palmer Dabbelt <[email protected]> +Link: https://lore.kernel.org/all/[email protected]/ +Cc: [email protected] +Signed-off-by: Kees Cook <[email protected]> + +Upstream-Status: Backport +Signed-off-by: Jon Mason <[email protected]> + +--- + scripts/gcc-plugins/gcc-common.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h +index 9a1895747b15..84c730da36dd 100644 +--- a/scripts/gcc-plugins/gcc-common.h ++++ b/scripts/gcc-plugins/gcc-common.h +@@ -71,7 +71,9 @@ + #include "varasm.h" + #include "stor-layout.h" + #include "internal-fn.h" ++#include "gimple.h" + #include "gimple-expr.h" ++#include "gimple-iterator.h" + #include "gimple-fold.h" + #include "context.h" + #include "tree-ssa-alias.h" +@@ -85,10 +87,8 @@ + #include "tree-eh.h" + #include "stmt.h" + #include "gimplify.h" +-#include "gimple.h" + #include "tree-phinodes.h" + #include "tree-cfg.h" +-#include "gimple-iterator.h" + #include "gimple-ssa.h" + #include "ssa-iterators.h" +
meta-arm/recipes-kernel/linux/linux-yocto%.bbappend +1 -0
@@ -4,6 +4,7 @@ FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" SRC_URI:append:aarch64 = " \ file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ + file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \ " COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
Signature · 1 line
2.30.2
Jon Mason
AppliedQuoted 1 line · Jon Mason
Applied, thanks!
[1/4] arm/linux-yocto: remove unused 5.15 patches and inc file
commit: ebe669ad9c75a001c367d9835f79856bf32a6de9
[2/4] arm-bsp/optee: Remove unreferenced patches
commit: 83ff3b1bd6958019d8d7a18ad8bf6881353b7f92
[3/4] CI: add debug yml file for ease of use
commit: cc9859e5b315f4a0374f8e6763498e926ef2488b
[4/4] arm/linux-yocto: add gcc 13 gimple backport patch
commit: 864d2a2c6a3adb4347763650bbbe5f4bffa96bbfBest regards,
Signature · 1 line
Jon Mason <[email protected]>