Merge branch 'mpc86xx'

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

diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h
index ec875f61adae103d77e50d2ecb86b782db7ebdb8..61896d0d7d1d6ce80eca4910bdf02f05513c0d78 100644 (file)
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -51,7 +51,9 @@
 
 #define CONFIG_BOOTDELAY       5
 
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL & ~CFG_CMD_NET )
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
+#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | CFG_CMD_PCI)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
 
@@ -68,7 +70,7 @@
 /* Print Buffer Size
  */
 #define CFG_PBSIZE     (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
-#define CFG_MAXARGS    8               /* Max number of command args   */
+#define CFG_MAXARGS    32              /* Max number of command args   */
 #define CFG_BARGSIZE   CFG_CBSIZE      /* Boot Argument Buffer Size    */
 #define CFG_LOAD_ADDR  0x00400000      /* Default load address         */
 
@@ -265,4 +267,17 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
+/*-----------------------------------------------------------------------
+ * PCI stuff
+ *-----------------------------------------------------------------------
+ */
+#define CONFIG_PCI
+#define CONFIG_PCI_PNP
+#undef  CONFIG_PCI_SCAN_SHOW
+
+
+#define CONFIG_SK98
+#define CONFIG_NET_MULTI
+
+
 #endif /* __CONFIG_H */