| Message ID | 20241217-tf-a-2-12-v1-1-3c9073a3f773@cherry.de |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip] bsp: trusted-firmware-a: remove already merged patch | expand |
On Tue 2024-12-17 @ 04:20:18 PM, Quentin Schulz via lists.yoctoproject.org wrote: > From: Quentin Schulz <quentin.schulz@cherry.de> > > 2.12.0 already has this patch, see 52cdebbcc5d1 ("fix(rockchip): fix > "unexpected token" error with clang"), so let's remove it. > > Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> > --- > Prepare for 2.12.0 upgrade, when > https://lore.kernel.org/yocto-meta-arm/20241217-tf-a-2-12-v1-1-cca762965260@cherry.de/ > is merged. meta-rockchip will then break building because it'll try to > apply an already-applied patch. > > ONLY TO BE APPLIED AFTER > https://lore.kernel.org/yocto-meta-arm/20241217-tf-a-2-12-v1-1-cca762965260@cherry.de/ > IS MERGED!!!! > --- > ...ros.S-Use-compatible-.asciz-asm-directive.patch | 31 ---------------------- > .../trusted-firmware-a_%.bbappend | 1 - > 2 files changed, 32 deletions(-) Applied to meta-rockchip, master branch. Thanks!
diff --git a/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch b/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch deleted file mode 100644 index 8807fcaabc0598d9c92b038fa6b443d2d1063945..0000000000000000000000000000000000000000 --- a/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5f78ce7eb9ab6bf5af682a715a9264d2a5ee7666 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 May 2021 12:06:34 -0700 -Subject: [PATCH] plat_macros.S: Use compatible .asciz asm directive - -clang asm does not like two strings to .asciz therefore make it single -string which works on clang too. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plat/rockchip/common/include/plat_macros.S | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S -index 691beeb44..c07be9ca9 100644 ---- a/plat/rockchip/common/include/plat_macros.S -+++ b/plat/rockchip/common/include/plat_macros.S -@@ -23,8 +23,7 @@ icc_regs: - - /* Registers common to both GICv2 and GICv3 */ - gicd_pend_reg: -- .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n" \ -- " Offset:\t\t\tvalue\n" -+ .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n Offset:\t\t\tvalue\n" - newline: - .asciz "\n" - spacer: --- -2.31.1 - diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index ecd6cb33c48b74c5523907986afc28cf14de1e8f..f2b666c127aed2747908fccea068bda5e6ac7def 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -12,7 +12,6 @@ COMPATIBLE_MACHINE:append:rk3588s = "|rk3588s" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://0001-dram-Fix-build-with-gcc-11.patch \ - file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch \ file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ "