summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-01-09 21:28:15 +0000
committerwdenk <wdenk>2005-01-09 21:28:15 +0000
commit6310eb9da74b1cf33194ae88275cc63b76e7a764 (patch)
tree0907eccba1dad0dd14c81f34e09976106d32dfa1 /include/asm-arm
parenta562e1bd9d8e10ea2e51d08e66d35a6e1795153b (diff)
downloadu-boot-imx-6310eb9da74b1cf33194ae88275cc63b76e7a764.zip
u-boot-imx-6310eb9da74b1cf33194ae88275cc63b76e7a764.tar.gz
u-boot-imx-6310eb9da74b1cf33194ae88275cc63b76e7a764.tar.bz2
Patches by David Snowdon, 07 Sep 2004:
- add u-boot.hex target in the top level Makefile - add support for the UNSW/NICTA PLEB 2 board (pleb2) - use -mtune=xscale and -march=armv5 options for PXA
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-pxa/hardware.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index a76a029..3ff1d26 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -84,10 +84,10 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
# define __REG(x) io_p2v(x)
# define __PREG(x) io_v2p(x)
-# undef io_p2v
+# undef io_p2v
# undef __REG
# ifndef __ASSEMBLY__
-# define io_p2v(PhAdd) (PhAdd)
+# define io_p2v(PhAdd) (PhAdd)
# define __REG(x) (*((volatile u32 *)io_p2v(x)))
# define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
# else
@@ -105,9 +105,9 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
* This must be called *before* the corresponding IRQ is registered.
* Use this instead of directly setting GRER/GFER.
*/
-#define GPIO_FALLING_EDGE 1
-#define GPIO_RISING_EDGE 2
-#define GPIO_BOTH_EDGES 3
+#define GPIO_FALLING_EDGE 1
+#define GPIO_RISING_EDGE 2
+#define GPIO_BOTH_EDGES 3
extern void set_GPIO_IRQ_edge( int gpio_nr, int edge_mask );
/*
@@ -147,4 +147,8 @@ extern unsigned int get_lclk_frequency_10khz(void);
#include "innokom.h"
#endif
-#endif /* _ASM_ARCH_HARDWARE_H */
+#ifdef CONFIG_ARCH_PLEB
+#include "pleb.h"
+#endif
+
+#endif /* _ASM_ARCH_HARDWARE_H */