Convert SMC911X Ethernet driver to CONFIG_NET_MULTI API
All in-tree boards that use this controller have CONFIG_NET_MULTI added Also: - changed CONFIG_DRIVER_SMC911X* to CONFIG_SMC911X* - cleaned up line lengths - modified all boards that override weak function in this driver - added Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Tested-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
@@ -53,9 +53,10 @@
|
||||
#undef CONFIG_SHOW_BOOT_PROGRESS
|
||||
|
||||
/* SMC9118 */
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0xB6080000
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
#define CONFIG_SMC911X_BASE 0xB6080000
|
||||
|
||||
/* MEMORY */
|
||||
#define AP325RXA_SDRAM_BASE (0x88000000)
|
||||
|
||||
@@ -69,9 +69,10 @@
|
||||
* Network Settings
|
||||
*/
|
||||
#define ADI_CMDS_NETWORK 1
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0x24000000
|
||||
#define CONFIG_DRIVER_SMC911X_16_BIT
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x24000000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_HOSTNAME bf548-ezkit
|
||||
/* Uncomment next line to use fixed MAC address */
|
||||
/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
|
||||
|
||||
@@ -69,9 +69,10 @@
|
||||
* Network Settings
|
||||
*/
|
||||
#define ADI_CMDS_NETWORK 1
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0x24000000
|
||||
#define CONFIG_DRIVER_SMC911X_16_BIT
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x24000000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_HOSTNAME cm-bf548
|
||||
/* Uncomment next line to use fixed MAC address */
|
||||
/* #define CONFIG_ETHADDR 02:80:ad:24:31:91 */
|
||||
|
||||
@@ -104,9 +104,10 @@
|
||||
"prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; protect off all; erase 0xa00d0000 0xa01effff; cp.b 0x80000000 0xa00d0000 $(filesize)\0"
|
||||
|
||||
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE (CS4_BASE + 0x00020000)
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE (CS4_BASE + 0x00020000)
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
|
||||
@@ -106,9 +106,10 @@
|
||||
"prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0"
|
||||
|
||||
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0xa8000000
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0xa8000000
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
|
||||
@@ -106,9 +106,10 @@
|
||||
"bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; " \
|
||||
"tftpboot 0x81000000 uImage-mx31; bootm\0"
|
||||
|
||||
#define CONFIG_DRIVER_SMC911X 1
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0xB6000000
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0xB6000000
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
|
||||
@@ -302,9 +302,10 @@ extern unsigned int boot_flash_type;
|
||||
*/
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
|
||||
#define CONFIG_DRIVER_SMC911X
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0x2C000000
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
|
||||
@@ -105,8 +105,9 @@
|
||||
#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
|
||||
|
||||
/* Network interface */
|
||||
#define CONFIG_DRIVER_SMC911X
|
||||
#define CONFIG_DRIVER_SMC911X_16_BIT
|
||||
#define CONFIG_DRIVER_SMC911X_BASE (0x24000000)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE (0x24000000)
|
||||
|
||||
#endif /* __RSK7203_H */
|
||||
|
||||
@@ -89,10 +89,11 @@
|
||||
/*
|
||||
* SMSC91C11x Network Card
|
||||
*/
|
||||
#define CONFIG_DRIVER_SMC911X
|
||||
#define CONFIG_DRIVER_SMC911X_BASE 0x00000000
|
||||
#define CONFIG_DRIVER_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0x00000000
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_NET_RETRY_COUNT 20
|
||||
#define CONFIG_NET_MULTI
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -342,7 +343,7 @@ int vct_gpio_get(int pin);
|
||||
#undef CONFIG_CMD_TERMINAL
|
||||
#undef CONFIG_CMD_USB
|
||||
|
||||
#undef CONFIG_DRIVER_SMC911X
|
||||
#undef CONFIG_SMC911X
|
||||
#undef CONFIG_SOFT_I2C
|
||||
#undef CONFIG_SOURCE
|
||||
#undef CONFIG_SYS_LONGHELP
|
||||
|
||||
@@ -71,6 +71,7 @@ int rtl8139_initialize(bd_t *bis);
|
||||
int rtl8169_initialize(bd_t *bis);
|
||||
int scc_initialize(bd_t *bis);
|
||||
int skge_initialize(bd_t *bis);
|
||||
int smc911x_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);
|
||||
|
||||
Reference in New Issue
Block a user