NAND finally working. Two bugs fixed:

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

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 6fa2d19c2fd6a8403392f7ed6821421fdbedc73e..0e20e5676349be1b2a42c41ad59150c5390d5a53 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -35,25 +35,20 @@
 
 #define CONFIG_MPC860          1       /* This is a MPC860 CPU         */
 #define CONFIG_IP860           1       /* ...on a IP860 board          */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
 #define CONFIG_BAUDRATE                9600
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
-#define        CONFIG_CLOCKS_IN_MHZ    1       /* clocks passsed to Linux in MHz */
-
 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" \
-"\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 $(filesize)\0"
-
-#define CONFIG_ETHADDR 00:30:bf:01:02:d2
-#define CONFIG_IPADDR  10.0.0.5
-#define CONFIG_SERVERIP        10.0.0.2
+"\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 ${filesize}\0"
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -91,10 +86,14 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* takes up to 10 msec */
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_BEDBUG | \
-                                CFG_CMD_I2C    | \
-                                CFG_CMD_EEPROM)
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
+#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
+                               CFG_CMD_BEDBUG  | \
+                               CFG_CMD_I2C     | \
+                               CFG_CMD_EEPROM  | \
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_SNTP    )
 
 #define CONFIG_BOOTP_MASK      CONFIG_BOOTP_DEFAULT
 
@@ -230,10 +229,13 @@
                         SIUMCR_DBGC11 | SIUMCR_MLRC10)
 
 /*-----------------------------------------------------------------------
- * Clock Setting - the IP860 has no 32kHz clock, so automatic detection fails
+ * Clock Setting - get clock frequency from Board Revision Register
  *-----------------------------------------------------------------------
  */
-#define        CONFIG_8xx_GCLK_FREQ    50000000
+#ifndef __ASSEMBLY__
+extern  unsigned long           ip860_get_clk_freq (void);
+#endif
+#define        CONFIG_8xx_GCLK_FREQ    ip860_get_clk_freq()
 
 /*-----------------------------------------------------------------------
  * TBSCR - Time Base Status and Control                                11-26
@@ -304,7 +306,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define      CFG_DER 0x2002000F*/
 #define CFG_DER        0
 
 /*
@@ -430,6 +431,8 @@ typedef     struct ip860_bcsr_s {
        unsigned char   wd_trigger;     /* +1A Watchdog trigger register        */
        unsigned char   reservedD;
        unsigned char   rmw_req;        /* +1C RMW request register             */
+       unsigned char   reservedE;
+       unsigned char   bd_rev;         /* +1E Board Revision register          */
 } ip860_bcsr_t;
 #endif /* __ASSEMBLY__ */