From 54800ba93246ef51a9356f21f72ea3a42c81c08c Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Tue, 31 Jul 2018 12:44:29 +0200 Subject: ARM: socfpga: arria10: move debug_ll to common code Instead of copy+pasting the debug_ll messages to every new board, move them to the respective functions. Signed-off-by: Steffen Trumtrar Signed-off-by: Sascha Hauer --- arch/arm/boards/reflex-achilles/lowlevel.c | 4 ---- arch/arm/mach-socfpga/arria10-init.c | 2 ++ arch/arm/mach-socfpga/arria10-sdram.c | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/reflex-achilles/lowlevel.c b/arch/arm/boards/reflex-achilles/lowlevel.c index 25e7ad0f1c..fe57518cbb 100644 --- a/arch/arm/boards/reflex-achilles/lowlevel.c +++ b/arch/arm/boards/reflex-achilles/lowlevel.c @@ -27,12 +27,8 @@ static noinline void achilles_entry(void) arria10_init(&mainpll_cfg, &perpll_cfg, pinmux); - puts_ll("lowlevel init done\n"); - arria10_ddr_calibration_sequence(); - puts_ll("SDRAM setup done\n"); - fdt = __dtb_socfpga_arria10_achilles_start + get_runtime_offset(); barebox_arm_entry(0x0, SZ_2G + SZ_1G, fdt); diff --git a/arch/arm/mach-socfpga/arria10-init.c b/arch/arm/mach-socfpga/arria10-init.c index f016b84bb7..faf4c866a4 100644 --- a/arch/arm/mach-socfpga/arria10-init.c +++ b/arch/arm/mach-socfpga/arria10-init.c @@ -194,4 +194,6 @@ void arria10_init(struct arria10_mainpll_cfg *mainpll, arria10_reset_deassert_fpga_peripherals(); INIT_LL(); + + puts_ll("lowlevel init done\n"); } diff --git a/arch/arm/mach-socfpga/arria10-sdram.c b/arch/arm/mach-socfpga/arria10-sdram.c index 08de0e32cd..35c355df71 100644 --- a/arch/arm/mach-socfpga/arria10-sdram.c +++ b/arch/arm/mach-socfpga/arria10-sdram.c @@ -531,5 +531,7 @@ int arria10_ddr_calibration_sequence(void) if (arria10_sdram_firewall_setup()) puts_ll("FW: Error Configuring Firewall\n"); + puts_ll("SDRAM setup done\n"); + return 0; } -- cgit v1.2.3