Reorder the timer.h file so it can be included from board config file.
Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Stephen Warren <swar...@wwwdotorg.org>
Cc: Tyler Baker <tyler.ba...@linaro.org>
---
arch/arm/mach-bcm283x/include/mach/timer.h | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h
b/arch/arm/mach-bcm283x/include/mach/timer.h
index fc7aec7..004c24b 100644
--- a/arch/arm/mach-bcm283x/include/mach/timer.h
+++ b/arch/arm/mach-bcm283x/include/mach/timer.h
@@ -13,6 +13,14 @@
#define BCM2835_TIMER_PHYSADDR 0x20003000
#endif
+#define BCM2835_TIMER_CS_M3 (1 << 3)
+#define BCM2835_TIMER_CS_M2 (1 << 2)
+#define BCM2835_TIMER_CS_M1 (1 << 1)
+#define BCM2835_TIMER_CS_M0 (1 << 0)
+
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+
struct bcm2835_timer_regs {
u32 cs;
u32 clo;
@@ -23,11 +31,8 @@ struct bcm2835_timer_regs {
u32 c3;
};
-#define BCM2835_TIMER_CS_M3 (1 << 3)
-#define BCM2835_TIMER_CS_M2 (1 << 2)
-#define BCM2835_TIMER_CS_M1 (1 << 1)
-#define BCM2835_TIMER_CS_M0 (1 << 0)
-
extern ulong get_timer_us(ulong base);
#endif
+
+#endif
--
2.1.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
