Merge branch 'master' of git://git.denx.de/u-boot-nios

[oweals/u-boot.git] / include / configs / SBC8540.h

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 272b5dd56cb8527b726b946b92311564531c3917..1989e5aea6b44ed08565744ebc462f91601f3c9c 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -24,22 +24,25 @@
  * MA 02111-1307 USA
  */
 
-/* mpc8560ads board configuration file */
-/* please refer to doc/README.mpc85xx for more info */
-/* make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
+/*
+ * sbc8540 board configuration file.
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#if XXX
-#define DEBUG                /* General debug */
-#define ET_DEBUG
+/*
+ * Top level Makefile configuration choices
+ */
+#ifdef CONFIG_MK_66
+#define CONFIG_PCI_66
 #endif
+
 #define TSEC_DEBUG
 
-/* High Level Configuration Options */
+/*
+ * High Level Configuration Options
+ */
 #define CONFIG_BOOKE           1       /* BOOKE                        */
 #define CONFIG_E500            1       /* BOOKE e500 family            */
 #define CONFIG_MPC85xx         1       /* MPC8540/MPC8560              */
@@ -287,6 +290,10 @@
    * GPIO pins used for bit-banged MII communications
    */
   #define MDIO_PORT    2               /* Port C */
+  #define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \
+                               (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT )
+  #define MDC_DECLARE  MDIO_DECLARE
+
   #define MDIO_ACTIVE  (iop->pdir |=  0x00400000)
   #define MDIO_TRISTATE        (iop->pdir &= ~0x00400000)
   #define MDIO_READ    ((iop->pdat &  0x00400000) != 0)