Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e53b848c34aa229b6f1f48d98ceb95e1d5470929..b7100e986cd04f4d13f21e08a679e5564fe0c5d9 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -66,7 +66,6 @@
 #define CONFIG_PCI_IO_BUS      0x50000000
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
-#define ADD_PCI_CMD            CFG_CMD_PCI
 #endif
 
 #define CFG_XLB_PIPELINING     1
@@ -83,6 +82,15 @@
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -91,6 +99,10 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
+#if defined(CONFIG_PCI)
+#define CODFIG_CMD_PCI
+#endif
+
 
 /*
  * Autobooting
@@ -133,12 +145,9 @@
 
 #if 0
 /* pass open firmware flat tree */
-#define CONFIG_OF_FLAT_TREE    1
+#define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1
 
-/* maximum size of the flat tree (8K) */
-#define OF_FLAT_TREE_MAX_SIZE  8192
-
 #define OF_CPU                 "PowerPC,5200@0"
 #define OF_SOC                 "soc5200@f0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 8)