diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-16 10:44:29 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 06:34:20 +0100 |
commit | a55c8d806eccac6ca29e4c8e2aa33379aedfea3e (patch) | |
tree | 5c525fb92f1fd2dac5788f86653591adabe9429f | |
parent | e74955c2fd8cc8d285772cdb84be8c8bec6d75ff (diff) | |
download | barebox-a55c8d806eccac6ca29e4c8e2aa33379aedfea3e.tar.gz barebox-a55c8d806eccac6ca29e4c8e2aa33379aedfea3e.tar.xz |
ARM: i.MX: remove __naked from imx*_barebox_entry
Since the stack is already configured when entering imx*_barebox_entry
we can remove the __naked attribute. This fixes some compilation issues
when some of the imx*_barebox_entry got too complicated to compile without
stack.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-imx/esdctl.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/esdctl.h | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c index c6479a0e54..0a71db66d7 100644 --- a/arch/arm/mach-imx/esdctl.c +++ b/arch/arm/mach-imx/esdctl.c @@ -480,7 +480,7 @@ upper_or_coalesced_range(unsigned long base0, unsigned long size0, } } -void __naked __noreturn imx1_barebox_entry(void *boarddata) +void __noreturn imx1_barebox_entry(void *boarddata) { unsigned long base, size; @@ -493,7 +493,7 @@ void __naked __noreturn imx1_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx25_barebox_entry(void *boarddata) +void __noreturn imx25_barebox_entry(void *boarddata) { unsigned long base, size; @@ -506,7 +506,7 @@ void __naked __noreturn imx25_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx27_barebox_entry(void *boarddata) +void __noreturn imx27_barebox_entry(void *boarddata) { unsigned long base, size; @@ -521,7 +521,7 @@ void __naked __noreturn imx27_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx31_barebox_entry(void *boarddata) +void __noreturn imx31_barebox_entry(void *boarddata) { unsigned long base, size; @@ -536,7 +536,7 @@ void __naked __noreturn imx31_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx35_barebox_entry(void *boarddata) +void __noreturn imx35_barebox_entry(void *boarddata) { unsigned long base, size; @@ -551,7 +551,7 @@ void __naked __noreturn imx35_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx51_barebox_entry(void *boarddata) +void __noreturn imx51_barebox_entry(void *boarddata) { unsigned long base, size; @@ -564,7 +564,7 @@ void __naked __noreturn imx51_barebox_entry(void *boarddata) barebox_arm_entry(base, size, boarddata); } -void __naked __noreturn imx53_barebox_entry(void *boarddata) +void __noreturn imx53_barebox_entry(void *boarddata) { unsigned long base, size; diff --git a/arch/arm/mach-imx/include/mach/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h index 28d44da938..468a9280c7 100644 --- a/arch/arm/mach-imx/include/mach/esdctl.h +++ b/arch/arm/mach-imx/include/mach/esdctl.h @@ -128,14 +128,14 @@ #define ESDCFGx_tRC_16 0x0000000f #ifndef __ASSEMBLY__ -void __naked __noreturn imx1_barebox_entry(void *boarddata); -void __naked __noreturn imx25_barebox_entry(void *boarddata); -void __naked __noreturn imx27_barebox_entry(void *boarddata); -void __naked __noreturn imx31_barebox_entry(void *boarddata); -void __naked __noreturn imx35_barebox_entry(void *boarddata); -void __naked __noreturn imx51_barebox_entry(void *boarddata); -void __naked __noreturn imx53_barebox_entry(void *boarddata); -void __naked __noreturn imx6_barebox_entry(void *boarddata); +void __noreturn imx1_barebox_entry(void *boarddata); +void __noreturn imx25_barebox_entry(void *boarddata); +void __noreturn imx27_barebox_entry(void *boarddata); +void __noreturn imx31_barebox_entry(void *boarddata); +void __noreturn imx35_barebox_entry(void *boarddata); +void __noreturn imx51_barebox_entry(void *boarddata); +void __noreturn imx53_barebox_entry(void *boarddata); +void __noreturn imx6_barebox_entry(void *boarddata); void imx_esdctl_disable(void); #endif |