Merge branch 'next' of git://git.denx.de/u-boot-net into next
This commit is contained in:
@@ -426,15 +426,17 @@
|
||||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
@@ -232,15 +232,17 @@
|
||||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
@@ -249,15 +249,17 @@
|
||||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
@@ -108,9 +108,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
#define CONFIG_DRIVER_S3C24X0_I2C 1 /* we use the buildin I2C controller */
|
||||
|
||||
|
||||
@@ -56,10 +56,11 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000300 /* armadillo board */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000300 /* armadillo board */
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -150,9 +150,10 @@
|
||||
/*
|
||||
* Network chip
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1
|
||||
#define CS8900_BUS32 1
|
||||
#define CS8900_BASE 0x08000000
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#define CONFIG_CS8900_BASE 0x08000000
|
||||
|
||||
/*
|
||||
* Stack sizes
|
||||
|
||||
@@ -47,10 +47,11 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000000
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000000
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -47,9 +47,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000000
|
||||
#define CS8900_BUS32 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000000
|
||||
#define CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -47,9 +47,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20008300
|
||||
#define CS8900_BUS16 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20008300
|
||||
#define CONFIG_CS8900_BUS16
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -66,9 +66,10 @@
|
||||
/*
|
||||
* CS8900 Ethernet drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x15000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x15000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -109,9 +109,10 @@
|
||||
"cp.b ${loadaddr} ${uboot_addr} ${filesize}; " \
|
||||
"setenv filesize; saveenv\0"
|
||||
|
||||
#define CONFIG_DRIVER_CS8900 1
|
||||
#define CS8900_BASE 0xb4020300
|
||||
#define CS8900_BUS16 1 /* follow the Linux driver */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900
|
||||
#define CONFIG_CS8900_BASE 0xb4020300
|
||||
#define CONFIG_CS8900_BUS16 1 /* follow the Linux driver */
|
||||
|
||||
/*
|
||||
* The MX31ADS board seems to have a hardware "peculiarity" confirmed under
|
||||
|
||||
@@ -138,6 +138,10 @@
|
||||
#define CONFIG_SMC_USE_32_BIT
|
||||
#define CONFIG_BOOTFILE "uImage"
|
||||
|
||||
#define CONFIG_IP_DEFRAG /* Allows faster download, TFTP and NFS */
|
||||
#define CONFIG_TFTP_BLOCKSIZE 4096
|
||||
#define CONFIG_NFS_READ_SIZE 4096
|
||||
|
||||
/* Storage information: onenand and nand */
|
||||
#define CONFIG_CMD_ONENAND
|
||||
#define CONFIG_MTD_ONENAND_VERIFY_WRITE
|
||||
|
||||
@@ -63,9 +63,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x19000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x19000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -56,9 +56,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -53,9 +53,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x19000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x19000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -74,9 +74,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x18800300
|
||||
#define CS8900_BUS16 1 /* follow the Linux driver */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x18800300
|
||||
#define CONFIG_CS8900_BUS16 /* follow the Linux driver */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
||||
@@ -99,9 +99,10 @@
|
||||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
#define CONFIG_DRIVER_S3C24X0_I2C 1 /* we use the buildin I2C controller */
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@ int cpu_eth_init(bd_t *bis);
|
||||
/* Driver initialization prototypes */
|
||||
int au1x00_enet_initialize(bd_t*);
|
||||
int bfin_EMAC_initialize(bd_t *bis);
|
||||
int cs8900_initialize(u8 dev_num, int base_addr);
|
||||
int dc21x4x_initialize(bd_t *bis);
|
||||
int davinci_emac_initialize(void);
|
||||
int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
||||
|
||||
Reference in New Issue
Block a user