bsp: trusted-firmware-a: remove already merged patch

2.12.0 already has this patch, see 52cdebbcc5d1 ("fix(rockchip): fix
"unexpected token" error with clang"), so let's remove it.

Build-tested-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Quentin Schulz 2024-12-17 16:20:18 +01:00 committed by Trevor Woerner
parent 1cdcb49603
commit 92b2b1c894
2 changed files with 0 additions and 32 deletions

View File

@ -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

View File

@ -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 \
"