From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Subject: [PATCH 4/6] ARM: Rockchip: Drop rk3xxx_atf_load_bl31()
Date: Fri, 20 Mar 2026 09:31:20 +0100 [thread overview]
Message-ID: <20260320-compressed-firmware-rockchip-v1-4-7d03c7e39d2f@pengutronix.de> (raw)
In-Reply-To: <20260320-compressed-firmware-rockchip-v1-0-7d03c7e39d2f@pengutronix.de>
rk3xxx_atf_load_bl31() are exported but only used in atf.c. Drop these
functions and inline the code in rk3xxx_barebox_entry().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-rockchip/atf.c | 36 ++++++++----------------------------
include/mach/rockchip/atf.h | 14 --------------
2 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/arch/arm/mach-rockchip/atf.c b/arch/arm/mach-rockchip/atf.c
index 37802bfade..4e1b9f6a21 100644
--- a/arch/arm/mach-rockchip/atf.c
+++ b/arch/arm/mach-rockchip/atf.c
@@ -185,12 +185,6 @@ static void rockchip_atf_load_bl31(void *fdt)
barebox_load_address, (uintptr_t)fdt);
}
-void rk3562_atf_load_bl31(void *fdt)
-{
- ROCKCHIP_GET_ADDRESSES(RK3562, rk3562_bl31_bin, rk3562_bl32_bin);
- rockchip_atf_load_bl31(fdt);
-}
-
void __noreturn rk3562_barebox_entry(void *fdt)
{
phys_addr_t memend;
@@ -204,6 +198,7 @@ void __noreturn rk3562_barebox_entry(void *fdt)
if (current_el() == 3) {
rk3562_lowlevel_init();
rockchip_store_bootrom_iram(IOMEM(RK3562_IRAM_BASE));
+ ROCKCHIP_GET_ADDRESSES(RK3562, rk3562_bl31_bin, rk3562_bl32_bin);
/*
* The downstream TF-A doesn't cope with our device tree when
@@ -216,7 +211,7 @@ void __noreturn rk3562_barebox_entry(void *fdt)
* Pass NULL for now until we have a good reason to pass a real
* device tree.
*/
- rk3562_atf_load_bl31(NULL);
+ rockchip_atf_load_bl31(NULL);
/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
}
@@ -224,12 +219,6 @@ void __noreturn rk3562_barebox_entry(void *fdt)
barebox_arm_entry(membase[0], memsize[0], fdt);
}
-void rk3568_atf_load_bl31(void *fdt)
-{
- ROCKCHIP_GET_ADDRESSES(RK3568, rk3568_bl31_bin, rk3568_bl32_bin);
- rockchip_atf_load_bl31(fdt);
-}
-
void __noreturn rk3568_barebox_entry(void *fdt)
{
phys_addr_t memend;
@@ -243,6 +232,7 @@ void __noreturn rk3568_barebox_entry(void *fdt)
if (current_el() == 3) {
rk3568_lowlevel_init();
rockchip_store_bootrom_iram(IOMEM(RK3568_IRAM_BASE));
+ ROCKCHIP_GET_ADDRESSES(RK3568, rk3568_bl31_bin, rk3568_bl32_bin);
/*
* The downstream TF-A doesn't cope with our device tree when
@@ -255,7 +245,7 @@ void __noreturn rk3568_barebox_entry(void *fdt)
* Pass NULL for now until we have a good reason to pass a real
* device tree.
*/
- rk3568_atf_load_bl31(NULL);
+ rockchip_atf_load_bl31(NULL);
/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
}
@@ -263,12 +253,6 @@ void __noreturn rk3568_barebox_entry(void *fdt)
barebox_arm_entry(membase[0], memsize[0], fdt);
}
-void rk3588_atf_load_bl31(void *fdt)
-{
- ROCKCHIP_GET_ADDRESSES(RK3588, rk3588_bl31_bin, rk3588_bl32_bin);
- rockchip_atf_load_bl31(fdt);
-}
-
void __noreturn rk3588_barebox_entry(void *fdt)
{
phys_addr_t memend;
@@ -283,6 +267,7 @@ void __noreturn rk3588_barebox_entry(void *fdt)
if (current_el() == 3) {
rk3588_lowlevel_init();
rockchip_store_bootrom_iram(IOMEM(RK3588_IRAM_BASE));
+ ROCKCHIP_GET_ADDRESSES(RK3588, rk3588_bl31_bin, rk3588_bl32_bin);
if (IS_ENABLED(CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT)) {
pr_debug("Copy fdt to scratch area 0x%p (%zu bytes)\n",
@@ -292,7 +277,7 @@ void __noreturn rk3588_barebox_entry(void *fdt)
pr_warn("Failed to create OP-TEE Device tree\n");
}
- rk3588_atf_load_bl31(rk_scratch->fdt);
+ rockchip_atf_load_bl31(rk_scratch->fdt);
/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
}
@@ -300,12 +285,6 @@ void __noreturn rk3588_barebox_entry(void *fdt)
barebox_arm_entry(membase[0], memsize[0], fdt);
}
-void rk3576_atf_load_bl31(void *fdt)
-{
- ROCKCHIP_GET_ADDRESSES(RK3576, rk3576_bl31_bin, rk3576_bl32_bin);
- rockchip_atf_load_bl31(fdt);
-}
-
void __noreturn rk3576_barebox_entry(void *fdt)
{
phys_addr_t memend;
@@ -321,6 +300,7 @@ void __noreturn rk3576_barebox_entry(void *fdt)
rk3576_lowlevel_init();
rockchip_store_bootrom_iram(IOMEM(RK3576_IRAM_BASE));
+ ROCKCHIP_GET_ADDRESSES(RK3576, rk3576_bl31_bin, rk3576_bl32_bin);
if (IS_ENABLED(CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT)) {
pr_debug("Copy fdt to scratch area 0x%p (%zu bytes)\n",
@@ -331,7 +311,7 @@ void __noreturn rk3576_barebox_entry(void *fdt)
pr_warn("Failed to copy fdt to scratch: Continue without fdt\n");
}
- rk3576_atf_load_bl31(fdt_scratch);
+ rockchip_atf_load_bl31(fdt_scratch);
/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
}
diff --git a/include/mach/rockchip/atf.h b/include/mach/rockchip/atf.h
index b8627a3598..5454d394a1 100644
--- a/include/mach/rockchip/atf.h
+++ b/include/mach/rockchip/atf.h
@@ -42,20 +42,6 @@
#define RK3576_BAREBOX_LOAD_ADDRESS (RK3576_DRAM_BOTTOM + 1024*1024)
#define RK3588_BAREBOX_LOAD_ADDRESS (RK3588_DRAM_BOTTOM + 1024*1024)
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_ARCH_ROCKCHIP_ATF
-void rk3562_atf_load_bl31(void *fdt);
-void rk3568_atf_load_bl31(void *fdt);
-void rk3576_atf_load_bl31(void *fdt);
-void rk3588_atf_load_bl31(void *fdt);
-#else
-static inline void rk3562_atf_load_bl31(void *fdt) { }
-static inline void rk3568_atf_load_bl31(void *fdt) { }
-static inline void rk3576_atf_load_bl31(void *fdt) { }
-static inline void rk3588_atf_load_bl31(void *fdt) { }
-#endif
-#endif
-
void __noreturn rk3562_barebox_entry(void *fdt);
void __noreturn rk3568_barebox_entry(void *fdt);
void __noreturn rk3576_barebox_entry(void *fdt);
--
2.47.3
next prev parent reply other threads:[~2026-03-20 8:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 8:31 [PATCH 0/6] Rockchip: Enable MMU before uncompressing TF-A and OP-TEE Sascha Hauer
2026-03-20 8:31 ` [PATCH 1/6] ARM: rockchip: dmc: rework DRAM functions Sascha Hauer
2026-03-20 8:31 ` [PATCH 2/6] ARM: rockchip: atf: make all memory banks available Sascha Hauer
2026-03-20 8:31 ` [PATCH 3/6] ARM: rockchip: atf: add OP-TEE fdt creation function for all SoCs Sascha Hauer
2026-03-20 8:31 ` Sascha Hauer [this message]
2026-03-20 8:31 ` [PATCH 5/6] ARM: rockchip: separate physical DRAM start from usable start Sascha Hauer
2026-03-20 8:31 ` [PATCH 6/6] ARM: rockchip: atf: enable MMU in PBL Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260320-compressed-firmware-rockchip-v1-4-7d03c7e39d2f@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox