projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
ether_fcc.c
diff --git
a/cpu/mpc8260/ether_fcc.c
b/cpu/mpc8260/ether_fcc.c
index ed3515fcf316bde3fd9bba21d398512ff518de9f..37bf4456ed1b032a892abced7dffb7c138943d39 100644
(file)
--- a/
cpu/mpc8260/ether_fcc.c
+++ b/
cpu/mpc8260/ether_fcc.c
@@
-47,11
+47,13
@@
#include <config.h>
#include <net.h>
#include <config.h>
#include <net.h>
-#if defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII)
#include <miiphy.h>
#endif
#include <miiphy.h>
#endif
-#if defined(CONFIG_ETHER_ON_FCC) && (CONFIG_COMMANDS & CFG_CMD_NET) && \
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
defined(CONFIG_NET_MULTI)
static struct ether_fcc_info_s
defined(CONFIG_NET_MULTI)
static struct ether_fcc_info_s
@@
-391,7
+393,7
@@
int fec_initialize(bd_t *bis)
eth_register(dev);
eth_register(dev);
-#if (defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)) \
+#if (defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII)) \
&& defined(CONFIG_BITBANGMII)
miiphy_register(dev->name,
bb_miiphy_read, bb_miiphy_write);
&& defined(CONFIG_BITBANGMII)
miiphy_register(dev->name,
bb_miiphy_read, bb_miiphy_write);
@@
-644,8
+646,6
@@
swap16 (unsigned short x)
void
eth_loopback_test (void)
{
void
eth_loopback_test (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile cpm8260_t *cp = &(immr->im_cpm);
int c, nclosed;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile cpm8260_t *cp = &(immr->im_cpm);
int c, nclosed;
@@
-1187,4
+1187,4
@@
eth_loopback_test (void)
#endif /* CONFIG_ETHER_LOOPBACK_TEST */
#endif /* CONFIG_ETHER_LOOPBACK_TEST */
-#endif
/* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
+#endif