diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-10-24 08:57:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-26 06:21:43 +0200 |
| commit | facfc7ed0283d24bd337f3c0d2e0cb4a4983c22e (patch) | |
| tree | b3df79cacea7b7e9db22a125f189ffd930451cce | |
| parent | ecbccc230f2d277e14a435e63494f0da4a185e0b (diff) | |
| download | barebox-facfc7ed0283d24bd337f3c0d2e0cb4a4983c22e.tar.gz barebox-facfc7ed0283d24bd337f3c0d2e0cb4a4983c22e.tar.xz | |
ARM: asm: cleanup 32-bit entry points
The experiment of using a common definition between ARM32 and ARM64
for ENTRY_FUNCTION_WITHSTACK was not fruitful and ARM64 no longer
uses __ARM_SETUP_STACK. Thus remove the definition and open code it for
ARM32. No functional change.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20221024065716.1215046-8-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 89b4a89755..dd12f642d9 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -177,7 +177,8 @@ void __barebox_arm64_head(ulong x0, ulong x1, ulong x2); static void ____##name(ulong, ulong, ulong); \ ENTRY_FUNCTION(name, arg0, arg1, arg2) \ { \ - __ARM_SETUP_STACK(name, stack_top); \ + if (stack_top) \ + arm_setup_stack(stack_top); \ ____##name(arg0, arg1, arg2); \ } \ static void noinline ____##name \ @@ -188,15 +189,14 @@ void __barebox_arm64_head(ulong x0, ulong x1, ulong x2); \ static void __##name(ulong, ulong, ulong); \ \ - void NAKED __section(.text_head_entry_##name) name \ + void __naked __section(.text_head_entry_##name) name \ (ulong r0, ulong r1, ulong r2) \ { \ __barebox_arm_head(); \ - __ARM_SETUP_STACK(name, 0); \ __##name(r0, r1, r2); \ } \ - static void NAKED noinline __##name \ - (ulong arg0, ulong arg1, ulong arg2) + static void __naked noinline __##name \ + (ulong arg0, ulong arg1, ulong arg2) #endif /* |