Rename CONFIG_SYS_INIT_RAM_END into CONFIG_SYS_INIT_RAM_SIZE

[platform/kernel/u-boot.git] / include / configs / IP860.h

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index b9c5713..cbece32 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -35,7 +35,11 @@
 
 #define CONFIG_MPC860          1       /* This is a MPC860 CPU         */
 #define CONFIG_IP860           1       /* ...on a IP860 board          */
+
+#define        CONFIG_SYS_TEXT_BASE    0x10000000
+
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
+#define CONFIG_RESET_PHY_R     1       /* Call reset_phy()             */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
 #define CONFIG_BAUDRATE                9600
@@ -147,9 +151,9 @@
  * 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 0x2F00  /* End of used area in DPRAM    */
+#define        CONFIG_SYS_INIT_RAM_SIZE        0x2F00  /* Size of used area in DPRAM   */
 #define        CONFIG_SYS_GBL_DATA_SIZE        64  /* 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_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
 #define        CONFIG_SYS_INIT_SP_OFFSET       CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------
@@ -209,6 +213,9 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CACHELINE_SHIFT     4       /* log base 2 of the above value        */
 #endif
+#define CONFIG_SYS_DELAYED_ICACHE      1       /* enable ICache not before
+                                                * running in RAM.
+                                                */
 
 /*-----------------------------------------------------------------------
  * SYPCR - System Protection Control                           11-9
@@ -371,6 +378,8 @@ extern  unsigned long           ip860_get_clk_freq (void);
 #define SRAM_SIZE      (1 + (~(CONFIG_SYS_OR3 & BR_BA_MSK)))
 #define CONFIG_SYS_OR3_PRELIM  CONFIG_SYS_OR3                  /* Make sure to map early */
 #define CONFIG_SYS_BR3_PRELIM  CONFIG_SYS_BR3                  /* in case it's used for ENV */
+#define        CONFIG_SYS_SRAM_BASE    SRAM_BASE
+#define        CONFIG_SYS_SRAM_SIZE    SRAM_SIZE
 
 /*
  * BR4/OR4 - Board Control & Status (8 bit)
@@ -449,18 +458,4 @@ typedef    struct ip860_bcsr_s {
 #define BD_CTRL_FLWE   0x20    /* Flash Write Enable                   */
 #define BD_CTRL_RWDN   0x10    /* VMEBus Requester Release When Done Enable */
 
-/*-----------------------------------------------------------------------
- *
- *-----------------------------------------------------------------------
- *
- */
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
-
 #endif /* __CONFIG_H */