hammerhead/mimc200: Use CONFIG_FLASH_CFI_DRIVER

[karo-tx-uboot.git] / common / miiphybb.c

diff --git a/common/miiphybb.c b/common/miiphybb.c
index adb697ca6bd0fa86e57ea87ad715e15f91922ce7..6446012f95e34361a8c1f86bb991666df3a1f2ef 100644 (file)
--- a/common/miiphybb.c
+++ b/common/miiphybb.c
@@ -30,9 +30,6 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 
-#ifdef CONFIG_BITBANGMII
-
-
 /*****************************************************************************
  *
  * Utility to send the preamble, address, and register (common to read
@@ -41,7 +38,7 @@
 static void miiphy_pre (char read, unsigned char addr, unsigned char reg)
 {
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 
@@ -126,7 +123,7 @@ int bb_miiphy_read (char *devname, unsigned char addr,
 {
        short rdreg;            /* register working value */
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 
@@ -193,7 +190,7 @@ int bb_miiphy_write (char *devname, unsigned char addr,
                unsigned char reg, unsigned short value)
 {
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 
@@ -236,5 +233,3 @@ int bb_miiphy_write (char *devname, unsigned char addr,
 
        return 0;
 }
-
-#endif /* CONFIG_BITBANGMII */