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

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

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index f6e6a609cf2415b69c20155b65e7754db476d882..614a046105cd616b7469abd2783bc63eded5204b 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -436,6 +436,7 @@
 /****************************************************************/
 
 /* NAND */
+#define CFG_NAND_LEGACY
 #define CFG_NAND_BASE          NAND_BASE
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CONFIG_MTD_NAND_VERIFY_WRITE
@@ -574,19 +575,17 @@ typedef unsigned int led_id_t;
 #define CONFIG_CRC32_VERIFY    1
 #define CONFIG_HUSH_OLD_PARSER_COMPATIBLE      1
 
-/* Note: change below for your network setting!!!
- * This was done just to facilitate manufacturing test and configuration.
- */
-#define CONFIG_ETHADDR  00:e0:0c:07:9b:8a
+/*****************************************************************************/
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_FLAT_TREE    1
 
-#define CONFIG_SERVERIP        192.168.08.1
-#define CONFIG_IPADDR                  192.168.08.85
-#define CONFIG_GATEWAYIP       192.168.08.1
-#define CONFIG_NETMASK         255.255.255.0
-#define CONFIG_HOSTNAME        stx_xtc
-#define CONFIG_ROOTPATH        /xtcroot
-#define CONFIG_BOOTFILE        uImage
-#define CONFIG_LOADADDR                0x1000000
+/* maximum size of the flat tree (8K) */
+#define OF_FLAT_TREE_MAX_SIZE  8192
 
+#define OF_CPU                 "PowerPC,MPC870@0"
+#define OF_TBCLK               (MPC8XX_HZ / 16)
+#define CONFIG_OF_HAS_BD_T     1
+#define CONFIG_OF_HAS_UBOOT_ENV        1
 
 #endif /* __CONFIG_H */