zipitz2: fix boot issue introduced by PXA low level init rework

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

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 6eb466a7252bd6058bb608a81353fb6afa621641..922b0798cfc730d503dc3d3884def948cfeadaee 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -33,6 +33,8 @@
 #define CONFIG_ISPAN                   /* ...on one of Interphase iSPAN boards */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFE7A0000
+
 /*-----------------------------------------------------------------------
  * Select serial console configuration
  *
@@ -70,8 +72,8 @@
 #if CONFIG_ETHER_INDEX == 3
 
 #define CONFIG_SYS_PHY_ADDR            0
-#define CONFIG_SYS_CMXFCR_VALUE        (CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
-#define CONFIG_SYS_CMXFCR_MASK         (CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE3       (CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
+#define CONFIG_SYS_CMXFCR_MASK3                (CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
 #endif /* CONFIG_ETHER_INDEX == 3 */
 
@@ -84,6 +86,10 @@
  * GPIO pins used for bit-banged MII communications
  */
 #define MDIO_PORT              3               /* Port D */
+#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            0x00040000      /* PD13 */
 #define CONFIG_SYS_MDC_PIN             0x00080000      /* PD12 */
@@ -167,7 +173,7 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve 4 MB for malloc()    */
@@ -225,19 +231,10 @@
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_IMMR
-#define CONFIG_SYS_INIT_RAM_END        0x4000          /* End of used area in DPRAM    */
-#define CONFIG_SYS_GBL_DATA_SIZE       128  /* Size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x4000          /* Size of used area in DPRAM   */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
-/*-----------------------------------------------------------------------
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from flash     */
-#define BOOTFLAG_WARM          0x02    /* Software reboot                      */
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */