From 3e62b38ff641f263df2f6c9e3ebda3c7c62f310b Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Mon, 1 Aug 2022 14:07:04 +0200 Subject: ARM: socfpga: achilles: use ENTRY_FUNCTION_WITHSTACK Use the newer function ENTRY_FUNCTION_WITHSTACK. Signed-off-by: Steffen Trumtrar Link: https://lore.barebox.org/20220801120708.2511165-4-s.trumtrar@pengutronix.de Signed-off-by: Sascha Hauer --- arch/arm/boards/reflex-achilles/lowlevel.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'arch') diff --git a/arch/arm/boards/reflex-achilles/lowlevel.c b/arch/arm/boards/reflex-achilles/lowlevel.c index 162cd58c58..2efb9aaea0 100644 --- a/arch/arm/boards/reflex-achilles/lowlevel.c +++ b/arch/arm/boards/reflex-achilles/lowlevel.c @@ -31,12 +31,15 @@ extern char __dtb_z_socfpga_arria10_achilles_start[]; -static noinline void achilles_start(void) +#define ARRIA10_STACKTOP ARRIA10_OCRAM_ADDR + SZ_256K + +ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_xload, ARRIA10_STACKTOP, r0, r1, r2) { int pbl_index = 0; int barebox = 0; int bitstream = 0; + arm_cpu_lowlevel_init(); relocate_to_current_adr(); setup_c(); @@ -75,13 +78,6 @@ static noinline void achilles_start(void) arria10_start_image(barebox); } -ENTRY_FUNCTION(start_socfpga_achilles_xload, r0, r1, r2) -{ - arm_cpu_lowlevel_init(); - arm_setup_stack(ARRIA10_OCRAM_ADDR + SZ_256K); - achilles_start(); -} - ENTRY_FUNCTION(start_socfpga_achilles, r0, r1, r2) { void *fdt; @@ -91,7 +87,7 @@ ENTRY_FUNCTION(start_socfpga_achilles, r0, r1, r2) barebox_arm_entry(0x0, SZ_2G + SZ_1G, fdt); } -ENTRY_FUNCTION(start_socfpga_achilles_bringup, r0, r1, r2) +ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_bringup, ARRIA10_STACKTOP, r0, r1, r2) { void *fdt; -- cgit v1.2.3