summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-01-12 00:15:14 +0000
committerwdenk <wdenk>2005-01-12 00:15:14 +0000
commit289f932c5ff628bf21a05073243071a01a2d3b02 (patch)
treeadfa2abf61660375c7d3609b100f18f1b30dde90 /drivers
parent082acfd4849d2f0471b0709fe7f5ce1de387437d (diff)
downloadu-boot-imx-289f932c5ff628bf21a05073243071a01a2d3b02.zip
u-boot-imx-289f932c5ff628bf21a05073243071a01a2d3b02.tar.gz
u-boot-imx-289f932c5ff628bf21a05073243071a01a2d3b02.tar.bz2
* Some Cleanup.
* Patch by Richard Woodruff, 10 Jan 2005: Update support for OMAP2420 (ARM11) and H4 board: o clean up and add new types to H4 memory probe code. o fix to work with internal boot. o added PRCM config III operation. o fix marginal flash timings. o add revison ATAG usage. o enable voltage scaling at power chip. o fix compile error for i2c. * Fix network problem (error when receiving multiple ARP packets)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/omap24xx_i2c.c5
-rw-r--r--drivers/pci_indirect.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/omap24xx_i2c.c b/drivers/omap24xx_i2c.c
index b64e713..383dfcb 100644
--- a/drivers/omap24xx_i2c.c
+++ b/drivers/omap24xx_i2c.c
@@ -21,14 +21,15 @@
*/
#include <common.h>
+
+#ifdef CONFIG_DRIVER_OMAP24XX_I2C
+
#include <asm/arch/i2c.h>
#include <asm/io.h>
#define inw(a) __raw_readw(a)
#define outw(a,v) __raw_writew(a,v)
-#ifdef CONFIG_DRIVER_OMAP24XX_I2C
-
static void wait_for_bb (void);
static u16 wait_for_pin (void);
void flush_fifo(void);
diff --git a/drivers/pci_indirect.c b/drivers/pci_indirect.c
index 0368681..584a4fc 100644
--- a/drivers/pci_indirect.c
+++ b/drivers/pci_indirect.c
@@ -21,6 +21,15 @@
#define cfg_read(val, addr, type, op) *val = op((type)(addr))
#define cfg_write(val, addr, type, op) op((type *)(addr), (val))
+#ifdef CONFIG_IXP425
+extern unsigned char in_8 (volatile unsigned *addr);
+extern unsigned short in_le16 (volatile unsigned *addr);
+extern unsigned in_le32 (volatile unsigned *addr);
+extern void out_8 (volatile unsigned *addr, char val);
+extern void out_le16 (volatile unsigned *addr, unsigned short val);
+extern void out_le32 (volatile unsigned *addr, unsigned int val);
+#endif /* CONFIG_IXP425 */
+
#if defined(CONFIG_MPC8260)
#define INDIRECT_PCI_OP(rw, size, type, op, mask) \
static int \