diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-02 10:01:27 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-05 22:22:16 +0200 |
| commit | e2a53458a7ab375233048e922c4adf494866a78f (patch) | |
| tree | 0d703e3070ba43394fae714629c09c998bf5b80d /board | |
| parent | d90f0c107bdb9766aeaf11181b97f5d7fde3efda (diff) | |
| download | blackbird-obmc-uboot-e2a53458a7ab375233048e922c4adf494866a78f.tar.gz blackbird-obmc-uboot-e2a53458a7ab375233048e922c4adf494866a78f.zip | |
net: drop !NET_MULTI code
This is long over due. All but two net drivers have been converted, but
those have now been dropped.
The only thing left to do is actually delete all references to NET_MULTI
and code that is compiled when that is not defined. So here we scrub the
core code.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/BuS/eb_cpux9k2/cpux9k2.c | 2 | ||||
| -rw-r--r-- | board/cm-bf537e/cm-bf537e.c | 2 | ||||
| -rw-r--r-- | board/cm-bf537u/cm-bf537u.c | 2 | ||||
| -rw-r--r-- | board/evb64260/eth.c | 2 | ||||
| -rw-r--r-- | board/tcm-bf537/tcm-bf537.c | 2 |
5 files changed, 1 insertions, 9 deletions
diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c index 856d798a31..54f9b64389 100644 --- a/board/BuS/eb_cpux9k2/cpux9k2.c +++ b/board/BuS/eb_cpux9k2/cpux9k2.c @@ -93,7 +93,6 @@ int misc_init_r(void) uchar midx; uchar macn6, macn7; -#ifdef CONFIG_NET_MULTI if (getenv("ethaddr") == NULL) { if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x00, CONFIG_SYS_I2C_EEPROM_ADDR_LEN, @@ -117,7 +116,6 @@ int misc_init_r(void) puts("Error: invalid MAC at EEPROM\n"); } } -#endif gd->jt[XF_do_reset] = (void *) do_reset; #ifdef CONFIG_STATUS_LED diff --git a/board/cm-bf537e/cm-bf537e.c b/board/cm-bf537e/cm-bf537e.c index 38dbc6e732..8daf3ad06e 100644 --- a/board/cm-bf537e/cm-bf537e.c +++ b/board/cm-bf537e/cm-bf537e.c @@ -26,7 +26,6 @@ int checkboard(void) static void board_init_enetaddr(char *var) { -#ifdef CONFIG_NET_MULTI uchar enetaddr[6]; if (eth_getenv_enetaddr(var, enetaddr)) @@ -35,7 +34,6 @@ static void board_init_enetaddr(char *var) printf("Warning: %s: generating 'random' MAC address\n", var); bfin_gen_rand_mac(enetaddr); eth_setenv_enetaddr(var, enetaddr); -#endif } #ifndef CONFIG_BFIN_MAC diff --git a/board/cm-bf537u/cm-bf537u.c b/board/cm-bf537u/cm-bf537u.c index a62ddd62b6..5941b5fcbe 100644 --- a/board/cm-bf537u/cm-bf537u.c +++ b/board/cm-bf537u/cm-bf537u.c @@ -26,7 +26,6 @@ int checkboard(void) static void board_init_enetaddr(char *var) { -#ifdef CONFIG_NET_MULTI uchar enetaddr[6]; if (eth_getenv_enetaddr(var, enetaddr)) @@ -35,7 +34,6 @@ static void board_init_enetaddr(char *var) printf("Warning: %s: generating 'random' MAC address\n", var); bfin_gen_rand_mac(enetaddr); eth_setenv_enetaddr(var, enetaddr); -#endif } #ifndef CONFIG_BFIN_MAC diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index 352505a51f..1492ffce90 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -32,7 +32,7 @@ Skeleton NIC driver for Etherboot #include "eth.h" #include "eth_addrtbl.h" -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) +#if defined(CONFIG_CMD_NET) #define GT6426x_ETH_BUF_SIZE 1536 diff --git a/board/tcm-bf537/tcm-bf537.c b/board/tcm-bf537/tcm-bf537.c index 004e0d9bb1..38aaae6870 100644 --- a/board/tcm-bf537/tcm-bf537.c +++ b/board/tcm-bf537/tcm-bf537.c @@ -26,7 +26,6 @@ int checkboard(void) static void board_init_enetaddr(char *var) { -#ifdef CONFIG_NET_MULTI uchar enetaddr[6]; if (eth_getenv_enetaddr(var, enetaddr)) @@ -35,7 +34,6 @@ static void board_init_enetaddr(char *var) printf("Warning: %s: generating 'random' MAC address\n", var); bfin_gen_rand_mac(enetaddr); eth_setenv_enetaddr(var, enetaddr); -#endif } #ifndef CONFIG_BFIN_MAC |
