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 with git://www.denx.de/git/u-boot.git
[oweals/u-boot.git]
/
common
/
miiphybb.c
diff --git
a/common/miiphybb.c
b/common/miiphybb.c
index adb697ca6bd0fa86e57ea87ad715e15f91922ce7..537c15d29b85e8bb226c050a3bbab10c70692ce0 100644
(file)
--- a/
common/miiphybb.c
+++ b/
common/miiphybb.c
@@
-41,7
+41,7
@@
static void miiphy_pre (char read, unsigned char addr, unsigned char reg)
{
int j; /* counter */
static void miiphy_pre (char read, unsigned char addr, unsigned char reg)
{
int j; /* counter */
-#if
ndef CONFIG_EP8248
+#if
!(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif
@@
-126,7
+126,7
@@
int bb_miiphy_read (char *devname, unsigned char addr,
{
short rdreg; /* register working value */
int j; /* counter */
{
short rdreg; /* register working value */
int j; /* counter */
-#if
ndef CONFIG_EP8248
+#if
!(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif
@@
-193,7
+193,7
@@
int bb_miiphy_write (char *devname, unsigned char addr,
unsigned char reg, unsigned short value)
{
int j; /* counter */
unsigned char reg, unsigned short value)
{
int j; /* counter */
-#if
ndef CONFIG_EP8248
+#if
!(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif
volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif