diff options
Diffstat (limited to 'arch/arm/boards/pine64-quartz64/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/pine64-quartz64/lowlevel.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/arch/arm/boards/pine64-quartz64/lowlevel.c b/arch/arm/boards/pine64-quartz64/lowlevel.c index b295885522..7723d47860 100644 --- a/arch/arm/boards/pine64-quartz64/lowlevel.c +++ b/arch/arm/boards/pine64-quartz64/lowlevel.c @@ -1,21 +1,17 @@ // 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/hardware.h> -#include <mach/atf.h> +#include <mach/rockchip/hardware.h> +#include <mach/rockchip/atf.h> #include <debug_ll.h> -#include <mach/rockchip.h> extern char __dtb_rk3566_quartz64_a_start[]; -static noinline void start_quartz64(void *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. - */ + putc_ll('>'); + if (current_el() == 3) relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS); else @@ -23,17 +19,5 @@ static noinline void start_quartz64(void *fdt) setup_c(); - 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) -{ - start_quartz64(__dtb_rk3566_quartz64_a_start); + rk3568_barebox_entry(__dtb_rk3566_quartz64_a_start); } |