After the removal of the IO domain configuration code, the common
low-level initialization method rk3568_start can be used to remove
code duplication.
Signed-off-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
---
.../rockchip-rk3568-bpi-r2pro/lowlevel.c | 33 +------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
index 36f7acd7d0..8b04dccc1e 100644
--- a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
+++ b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
@@ -1,43 +1,12 @@
// 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 <debug_ll.h>
#include <mach/rockchip.h>
extern char __dtb_rk3568_bpi_r2_pro_start[];
-static noinline void rk3568_start(void)
-{
- void *fdt;
-
- 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();
-
- setup_c();
-
- rk3568_start();
+ rk3568_start(__dtb_rk3568_bpi_r2_pro_start);
}
--
2.30.2
