All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-rockchip][PATCH 1/2] trusted-firmware-a: remove no-longer-required patches
@ 2025-06-13 10:23 Trevor Woerner
  2025-06-13 10:23 ` [meta-rockchip][PATCH 2/2] fitimage rework Trevor Woerner
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Trevor Woerner @ 2025-06-13 10:23 UTC (permalink / raw)
  To: yocto-patches

The two patches being carried in this layer for tf-a are no longer required
and can be dropped.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 .../0001-dram-Fix-build-with-gcc-11.patch     | 35 -------------------
 ...rk-already-defined-functions-as-weak.patch | 35 -------------------
 .../trusted-firmware-a_%.bbappend             |  7 ----
 3 files changed, 77 deletions(-)
 delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch
 delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch

diff --git a/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch b/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch
deleted file mode 100644
index 120ea0bd3635..000000000000
--- a/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a09a1de53aba422249a8376b0d95024200021317 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 11 May 2021 11:55:31 -0700
-Subject: [PATCH] dram: Fix build with gcc 11
-
-This is a redundant assignment which GCC warns about.
-
-Fixes
-
-plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c:781:11: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself [-Werror,-Wself-assign]
-                twr_tmp = twr_tmp;
-                ~~~~~~~ ^ ~~~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c
-index 3cdb7a296..76bc5ee96 100644
---- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c
-+++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c
-@@ -778,7 +778,7 @@ static void lpddr3_get_parameter(struct timing_related_config *timing_config,
- 	else if (twr_tmp <= 8)
- 		twr_tmp = 8;
- 	else if (twr_tmp <= 12)
--		twr_tmp = twr_tmp;
-+		; /* do nothing */
- 	else if (twr_tmp <= 14)
- 		twr_tmp = 14;
- 	else
--- 
-2.31.1
-
diff --git a/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch b/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch
deleted file mode 100644
index bd4d2b594e44..000000000000
--- a/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9d963cd69faf94bdcb80624132fd10392f57875b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 11 May 2021 12:11:51 -0700
-Subject: [PATCH] pmu: Do not mark already defined functions as weak
-
-These functions are already defined as static functions in same header
-Fixes
-
-| plat/rockchip/common/drivers/pmu/pmu_com.h:35:14: error: weak identifier 'pmu_power_domain_ctr' never declared [-Werror]                                                                                      | #pragma weak pmu_power_domain_ctr                                                                                                                                                                             |              ^
-| plat/rockchip/common/drivers/pmu/pmu_com.h:36:14: error: weak identifier 'check_cpu_wfie' never declared [-Werror]
-| #pragma weak check_cpu_wfie
-|              ^
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plat/rockchip/common/drivers/pmu/pmu_com.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h
-index 5359f73b4..3f9ce7df9 100644
---- a/plat/rockchip/common/drivers/pmu/pmu_com.h
-+++ b/plat/rockchip/common/drivers/pmu/pmu_com.h
-@@ -32,8 +32,6 @@ enum pmu_pd_state {
- };
- 
- #pragma weak plat_ic_get_pending_interrupt_id
--#pragma weak pmu_power_domain_ctr
--#pragma weak check_cpu_wfie
- 
- static inline uint32_t pmu_power_domain_st(uint32_t pd)
- {
--- 
-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 f2b666c127ae..4c7fc3c4c180 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -9,13 +9,6 @@ COMPATIBLE_MACHINE:append:rk3566 = "|rk3566"
 COMPATIBLE_MACHINE:append:rk3568 = "|rk3568"
 COMPATIBLE_MACHINE:append:rk3588s = "|rk3588s"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI += "\
-    file://0001-dram-Fix-build-with-gcc-11.patch \
-    file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \
-"
-
-
 # code bloats with clang and results in error below now
 # | aarch64-yoe-linux-musl-ld: region `PMUSRAM' overflowed by 3928 bytes
 # this needs fixing until then use gcc
-- 
2.44.0.501.g19981daefd7c



^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-06-13 15:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-13 10:23 [meta-rockchip][PATCH 1/2] trusted-firmware-a: remove no-longer-required patches Trevor Woerner
2025-06-13 10:23 ` [meta-rockchip][PATCH 2/2] fitimage rework Trevor Woerner
2025-06-13 12:32   ` [yocto-patches] " Quentin Schulz
2025-06-13 14:42     ` Trevor Woerner
2025-06-13 12:11 ` [yocto-patches] [meta-rockchip][PATCH 1/2] trusted-firmware-a: remove no-longer-required patches Quentin Schulz
2025-06-13 15:05   ` Trevor Woerner
2025-06-13 15:06 ` Trevor Woerner

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.