[PATCH] imx27-regs: fix .h usage in assembly file

Eric Bénard eric at eukrea.com
Thu Apr 5 05:41:36 EDT 2012


7ab0a0a i.MX27: Added helper for setup chipselect control register
added an helper which triggers the following error :
arch/arm/mach-imx/include/mach/imx27-regs.h:243: Error: bad instruction `static inline void imx27_setup_weimcs(size_t cs,unsigned upper,unsigned lower,unsigned addional)'

This patch fix this problem.

Signed-off-by: Eric Bénard <eric at eukrea.com>
---
 arch/arm/mach-imx/include/mach/imx27-regs.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 25ea04a..437cc7d 100644
--- a/arch/arm/mach-imx/include/mach/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
@@ -240,11 +240,13 @@
 #define IMX_CS4_BASE	0xD4000000
 #define IMX_CS5_BASE	0xD6000000
 
+#ifndef __ASSEMBLY__
 static inline void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, unsigned addional)
 {
 	CSxU(cs) = upper;
 	CSxL(cs) = lower;
 	CSxA(cs) = addional;
 }
+#endif /* __ASSEMBLY__ */
 
 #endif /* _IMX27_REGS_H */
-- 
1.7.7.6




More information about the barebox mailing list