diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-23 20:08:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-05 08:49:07 +0200 |
| commit | 4a26017f6dd70c6b0c0fd11d527291058c85cea5 (patch) | |
| tree | ceef7084dec5382d2797bfba30acff1528314baa /arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c | |
| parent | 1a6cab4f07b45fd1bca5d62ea37c00d26e70cde7 (diff) | |
| download | barebox-4a26017f6dd70c6b0c0fd11d527291058c85cea5.tar.gz barebox-4a26017f6dd70c6b0c0fd11d527291058c85cea5.tar.xz | |
ARM: Rockchip: rk3568: use rk3568_barebox_entry()
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>
Diffstat (limited to 'arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c index 23bacc91d9..12c2445287 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,23 +26,6 @@ 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 @@ -52,5 +33,5 @@ ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2) setup_c(); - rk3568_start(); + rk3568_barebox_entry(__dtb_rk3568_bpi_r2_pro_start); } |