diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
| commit | 0ee8746a93e29a3d884f19598409a3bea8ff51ab (patch) | |
| tree | 1544d350005f0ff1403c21e2c795575e51901ae1 /include | |
| parent | 456be17dbe0e22ee2be9fafa1ea8888ddf6bd514 (diff) | |
| parent | 1ca6d0df3ecb028e989f3489b95d021f4497477b (diff) | |
| download | talos-obmc-uboot-0ee8746a93e29a3d884f19598409a3bea8ff51ab.tar.gz talos-obmc-uboot-0ee8746a93e29a3d884f19598409a3bea8ff51ab.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_cmd_all.h | 1 | ||||
| -rw-r--r-- | include/configs/SMN42.h | 2 | ||||
| -rw-r--r-- | include/configs/lpc2292sodimm.h | 2 | ||||
| -rw-r--r-- | include/netdev.h | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 746bf18f04..cdc5ff10fa 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -70,6 +70,7 @@ #define CONFIG_CMD_PORTIO /* Port I/O */ #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ +#define CONFIG_CMD_RARP /* rarpboot support */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SAVES /* save S record dump */ diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index adb6ac52e1..ba3ada13a5 100644 --- a/include/configs/SMN42.h +++ b/include/configs/SMN42.h @@ -198,6 +198,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_MMC 1 /* we use this ethernet chip */ -#define CONFIG_ENC28J60 +#define CONFIG_ENC28J60_LPC2292 #endif /* __CONFIG_H */ diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index 7ce8d6de1f..65276a27c0 100644 --- a/include/configs/lpc2292sodimm.h +++ b/include/configs/lpc2292sodimm.h @@ -156,6 +156,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_MMC 1 /* we use this ethernet chip */ -#define CONFIG_ENC28J60 +#define CONFIG_ENC28J60_LPC2292 #endif /* __CONFIG_H */ diff --git a/include/netdev.h b/include/netdev.h index 94eedfe29d..7f66419350 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -54,6 +54,8 @@ int designware_initialize(u32 id, ulong base_addr, u32 phy_addr); int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr); int e1000_initialize(bd_t *bis); int eepro100_initialize(bd_t *bis); +int enc28j60_initialize(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int mode); int ep93xx_eth_initialize(u8 dev_num, int base_addr); int ethoc_initialize(u8 dev_num, int base_addr); int eth_3com_initialize (bd_t * bis); @@ -85,9 +87,9 @@ int skge_initialize(bd_t *bis); int smc911x_initialize(u8 dev_num, int base_addr); int smc91111_initialize(u8 dev_num, int base_addr); int tsi108_eth_initialize(bd_t *bis); -int uec_initialize(int index); int uec_standard_init(bd_t *bis); int uli526x_initialize(bd_t *bis); +int xilinx_emaclite_initialize (bd_t *bis, int base_addr); int sh_eth_initialize(bd_t *bis); int dm9000_initialize(bd_t *bis); |
