Merge branch 'next' of ../next

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

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 625d8ee8ba0d7c3cc39950019a4a9e519b8b53fc..43c191b4356c1e87f30ff7aaa7f5fde2c0320ba8 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002-2005
- * Gary Jennejohn <gj@denx.de>
+ * Gary Jennejohn <garyj@denx.de>
  *
  * Configuation settings for the TRAB board.
  *
@@ -99,9 +99,10 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_CS8900   1       /* we have a CS8900 on-board */
-#define CS8900_BASE            0x07000300 /* agrees with WIN CE PA */
-#define CS8900_BUS16           1 /* the Linux driver does accesses as shorts */
+#define CONFIG_NET_MULTI
+#define CONFIG_CS8900          /* we have a CS8900 on-board */
+#define CONFIG_CS8900_BASE     0x07000300 /* agrees with WIN CE PA */
+#define CONFIG_CS8900_BUS16    /* the Linux driver does accesses as shorts */
 
 #define CONFIG_DRIVER_S3C24X0_I2C 1    /* we use the buildin I2C controller */
 
@@ -111,6 +112,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1         1       /* we use SERIAL 1 on TRAB */
 
 #define CONFIG_HWFLOW                  /* include RTS/CTS flow control support */
@@ -374,6 +376,8 @@
 
 /* Dynamic MTD partition support */
 #define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nor0=0"
 
 /* production flash layout */