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

[u-boot] / include / configs / muas3001.h

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index c94daa3d0335ce82477d907ce60196d82f7ae72c..345bdd119a9c3cdca6d24e7f6ffb522ad5056744 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -33,6 +33,8 @@
 #define CONFIG_MPC8260         1
 #define CONFIG_MUAS3001                1
 
+#define        CONFIG_SYS_TEXT_BASE    0xFF000000
+
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* Do boardspecific init */
@@ -101,6 +103,10 @@
  * GPIO pins used for bit-banged MII communications
  */
 #define MDIO_PORT      0               /* Port A */
+#define MDIO_DECLARE   volatile ioport_t *iop = ioport_addr ( \
+                               (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT )
+#define MDC_DECLARE    MDIO_DECLARE
+
 
 #define CONFIG_SYS_MDIO_PIN    0x00200000      /* PA10 */
 #define CONFIG_SYS_MDC_PIN     0x00400000      /* PA9  */
@@ -221,7 +227,7 @@
 
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
@@ -271,9 +277,6 @@
 #define CONFIG_SYS_HRCW_SLAVE6         0
 #define CONFIG_SYS_HRCW_SLAVE7         0
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM          0x02    /* Software reboot                  */
-
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve 4 MB for malloc()    */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */