From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH v2 4/6] ARM: Rockchip: rk3568: use rk3568_barebox_entry()
Date: Tue, 28 Mar 2023 09:40:35 +0200 [thread overview]
Message-ID: <20230328074037.1202993-5-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230328074037.1202993-1-s.hauer@pengutronix.de>
There is a rk3568 specific entry function for barebox now, switch
the existing boards over to use it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/pine64-quartz64/lowlevel.c | 30 +++--------------
arch/arm/boards/radxa-rock3/lowlevel.c | 31 +++---------------
.../rockchip-rk3568-bpi-r2pro/lowlevel.c | 31 +++---------------
.../arm/boards/rockchip-rk3568-evb/lowlevel.c | 32 +++----------------
4 files changed, 17 insertions(+), 107 deletions(-)
diff --git a/arch/arm/boards/pine64-quartz64/lowlevel.c b/arch/arm/boards/pine64-quartz64/lowlevel.c
index 1e63c0e698..975f8aa51c 100644
--- a/arch/arm/boards/pine64-quartz64/lowlevel.c
+++ b/arch/arm/boards/pine64-quartz64/lowlevel.c
@@ -1,41 +1,19 @@
// SPDX-License-Identifier: GPL-2.0-only
+
#include <common.h>
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/rockchip/hardware.h>
#include <mach/rockchip/atf.h>
#include <debug_ll.h>
-#include <mach/rockchip/rockchip.h>
extern char __dtb_rk3566_quartz64_a_start[];
-static noinline void start_quartz64(void)
-{
- void *fdt = __dtb_rk3566_quartz64_a_start;
-
- if (current_el() == 3) {
- rk3568_lowlevel_init();
- rk3568_atf_load_bl31(fdt);
- /* not reached */
- }
-
- barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM,
- fdt);
-}
-
ENTRY_FUNCTION(start_quartz64a, r0, r1, r2)
{
- /*
- * Image execution starts at 0x0, but this is used for ATF and
- * OP-TEE later, so move away from here.
- */
- if (current_el() == 3)
- relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
- else
- relocate_to_current_adr();
+ putc_ll('>');
+ relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
setup_c();
- start_quartz64();
+ rk3568_barebox_entry(__dtb_rk3566_quartz64_a_start);
}
diff --git a/arch/arm/boards/radxa-rock3/lowlevel.c b/arch/arm/boards/radxa-rock3/lowlevel.c
index a8226749d4..866abd8bcb 100644
--- a/arch/arm/boards/radxa-rock3/lowlevel.c
+++ b/arch/arm/boards/radxa-rock3/lowlevel.c
@@ -1,19 +1,15 @@
// SPDX-License-Identifier: GPL-2.0-only
+
#include <common.h>
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/rockchip/hardware.h>
#include <mach/rockchip/atf.h>
#include <debug_ll.h>
-#include <mach/rockchip/rockchip.h>
extern char __dtb_rk3568_rock_3a_start[];
-static noinline void rk3568_start(void)
+ENTRY_FUNCTION(start_rock3a, r0, r1, r2)
{
- void *fdt = __dtb_rk3568_rock_3a_start;
-
/*
* Enable vccio4 1.8V and vccio6 1.8V
* Needed for GMAC to work.
@@ -24,27 +20,10 @@ static noinline void rk3568_start(void)
*/
writel(RK_SETBITS(0x50), 0xfdc20140);
- if (current_el() == 3) {
- rk3568_lowlevel_init();
- rk3568_atf_load_bl31(fdt);
- /* not reached */
- }
-
- barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM, fdt);
-}
-
-ENTRY_FUNCTION(start_rock3a, r0, r1, r2)
-{
- /*
- * Image execution starts at 0x0, but this is used for ATF and
- * OP-TEE later, so move away from here.
- */
- if (current_el() == 3)
- relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
- else
- relocate_to_current_adr();
+ putc_ll('>');
+ relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
setup_c();
- rk3568_start();
+ rk3568_barebox_entry(__dtb_rk3568_rock_3a_start);
}
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
index 23bacc91d9..468d0f1ac3 100644
--- a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
+++ b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <common.h>
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/rockchip/hardware.h>
#include <mach/rockchip/atf.h>
@@ -11,9 +9,9 @@
extern char __dtb_rk3568_bpi_r2_pro_start[];
-static noinline void rk3568_start(void)
+ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
{
- void *fdt;
+ putc_ll('>');
/*
* set iodomain vccio6 to 1.8V needed for GMAC1 to work.
@@ -28,29 +26,8 @@ static noinline void rk3568_start(void)
//clear bit 6 for 3v3 as it was set to 1v8
writel(RK_CLRBITS(BIT(6)), PMU_GRF_IO_VSEL1);
- fdt = __dtb_rk3568_bpi_r2_pro_start;
-
- if (current_el() == 3) {
- rk3568_lowlevel_init();
- rk3568_atf_load_bl31(fdt);
- /* not reached */
- }
-
- barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM, fdt);
-}
-
-ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
-{
- /*
- * Image execution starts at 0x0, but this is used for ATF and
- * OP-TEE later, so move away from here.
- */
- if (current_el() == 3)
- relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
- else
- relocate_to_current_adr();
-
+ relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
setup_c();
- rk3568_start();
+ rk3568_barebox_entry(__dtb_rk3568_bpi_r2_pro_start);
}
diff --git a/arch/arm/boards/rockchip-rk3568-evb/lowlevel.c b/arch/arm/boards/rockchip-rk3568-evb/lowlevel.c
index 8720e6d9ae..100e6b0098 100644
--- a/arch/arm/boards/rockchip-rk3568-evb/lowlevel.c
+++ b/arch/arm/boards/rockchip-rk3568-evb/lowlevel.c
@@ -1,20 +1,15 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <common.h>
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/rockchip/hardware.h>
#include <mach/rockchip/atf.h>
#include <debug_ll.h>
-#include <mach/rockchip/rockchip.h>
extern char __dtb_rk3568_evb1_v10_start[];
-static noinline void rk3568_start(void)
+ENTRY_FUNCTION(start_rk3568_evb, r0, r1, r2)
{
- void *fdt;
-
/*
* Enable vccio4 1.8V and vccio6 1.8V
* Needed for GMAC to work.
@@ -25,29 +20,10 @@ static noinline void rk3568_start(void)
*/
writel(RK_SETBITS(0x50), 0xfdc20140);
- fdt = __dtb_rk3568_evb1_v10_start;
-
- if (current_el() == 3) {
- rk3568_lowlevel_init();
- rk3568_atf_load_bl31(fdt);
- /* not reached */
- }
-
- barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM, fdt);
-}
-
-ENTRY_FUNCTION(start_rk3568_evb, r0, r1, r2)
-{
- /*
- * Image execution starts at 0x0, but this is used for ATF and
- * OP-TEE later, so move away from here.
- */
- if (current_el() == 3)
- relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
- else
- relocate_to_current_adr();
+ putc_ll('>');
+ relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
setup_c();
- rk3568_start();
+ rk3568_barebox_entry(__dtb_rk3568_evb1_v10_start);
}
--
2.39.2
next prev parent reply other threads:[~2023-03-28 7:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 7:40 [PATCH v2 0/6] ARM: Rockchip: Read amount of memory from DDR controller Sascha Hauer
2023-03-28 7:40 ` [PATCH v2 1/6] ARM: dts: rk356x: Add DMC controller node Sascha Hauer
2023-03-28 7:40 ` [PATCH v2 2/6] ARM: Rockchip: implement memory read out from controller Sascha Hauer
2023-03-28 8:18 ` Sascha Hauer
2023-04-03 19:43 ` Sascha Hauer
2023-04-04 6:25 ` Michael Riesch
2023-03-28 7:40 ` [PATCH v2 3/6] ARM: Rockchip: Add rk3568 specific barebox entry function Sascha Hauer
2023-03-28 7:40 ` Sascha Hauer [this message]
2023-04-05 6:48 ` [PATCH v2 4/6] ARM: Rockchip: rk3568: use rk3568_barebox_entry() Sascha Hauer
2023-03-28 7:40 ` [PATCH v2 5/6] ARM: Rockchip: make bootsource logic generic to all SoCs Sascha Hauer
2023-03-28 7:40 ` [PATCH v2 6/6] ARM: Rockchip: Do not pass device tree to TF-A Sascha Hauer
2023-03-31 15:42 ` [PATCH v2 0/6] ARM: Rockchip: Read amount of memory from DDR controller Michael Riesch
2023-04-03 7:32 ` Sascha Hauer
2023-04-03 10:04 ` Michael Riesch
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=20230328074037.1202993-5-s.hauer@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