Merge with /home/m8/git/u-boot

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

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 0ae26c24fb045354c67361c4473662251b70ee66..103976283013a937dcc704bfcf5a7871d09ce662 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -1,4 +1,7 @@
 /*
+ * (C) Copyright 2004-2005
+ * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
+ *
  * (C) Copyright 2004
  * Vincent Dubey, Xa SA, vincent.dubey@xa-ch.com
  *
@@ -33,16 +36,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
-/*
-#undef CONFIG_INIT_CRITICAL
-*/
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -65,11 +58,18 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
 #define CONFIG_BAUDRATE                115200
 
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
 
-#define CONFIG_COMMANDS                ((CONFIG_CMD_DFL | CFG_CMD_DIAG | CFG_CMD_SDRAM) & ~CFG_CMD_DTT)
+#define CONFIG_COMMANDS               ((CONFIG_CMD_DFL & ~CFG_CMD_DTT) | \
+                               CFG_CMD_DHCP    | \
+                               CFG_CMD_DIAG    | \
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_SDRAM   | \
+                               CFG_CMD_SNTP    )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -82,7 +82,9 @@
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTCOMMAND     "bootm 0x00100000"
 #define CONFIG_BOOTARGS                "console=ttyS1,115200"
-#define CONFIG_CMDLINE_TAG1                            /* enable passing of ATAGs */
+#define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS       1
+#define CONFIG_INITRD_TAG              1
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200                  /* speed to run kgdb serial port */
@@ -179,7 +181,7 @@
  * SMSC91C111 Network Card
  */
 #define CONFIG_DRIVER_SMC91111         1
-#define CONFIG_SMC91111_BASE           0x0C00030  /* chip select 3         */
+#define CONFIG_SMC91111_BASE           0x10000300  /* chip select 3         */
 #define CONFIG_SMC_USE_32_BIT          1          /* 32 bit bus  */
 #undef  CONFIG_SMC_91111_EXT_PHY                  /* we use internal phy   */
 #undef  CONFIG_SHOW_ACTIVITY
@@ -234,7 +236,7 @@
  * GP30 == SDATA_OUT is 0
  * GP81 == NSSPCLK   is 0
  */
-#define CFG_GPCR0_VAL          0x40C31868
+#define CFG_GPCR0_VAL          0x40C31848
 #define CFG_GPCR1_VAL          0x00000000
 #define CFG_GPCR2_VAL          0x00020000
 
@@ -453,10 +455,10 @@
  * [14:12] 010  - RRR2: CS deselect to CS time: 2*(2*MemClk) = 40 ns
  * [11:08] 0010 - RDN2: Address to data valid in bursts: (2+1)*MemClk = 30 ns
  * [07:04] 0110 - RDF2: Address for first access: (6+1)*MemClk = 70 ns
- * [03]    0    - 32 Bit bus width
+ * [03]    1    - 16 Bit bus width
  * [02:00] 100  - variable latency I/O
  */
-#define CFG_MSC1_VAL           0x1224A264
+#define CFG_MSC1_VAL           0x1224A26C
 
 /* This is the configuration for nCS4/5 -> LAN
  * configuration for nCS5: