Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/barco.h b/include/configs/barco.h
index 225ab8d0e1433049ce1dc39bef3d7faf60249586..4f57067db155110ac17c9d545a5febe31d976199 100644 (file)
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -70,13 +70,17 @@
 
 #define CONFIG_BOOTARGS "mem=32M"
 
-/* Add support for a few extra bootp options like:
- *     - File size
- *     - DNS
+
+/*
+ * BOOTP options
  */
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_BOOTFILESIZE | \
-                                CONFIG_BOOTP_DNS)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS
+
 
 /*
  * Command line configuration.
@@ -88,10 +92,12 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_PCI
 
+#undef CONFIG_CMD_NET
+
 
 #define CONFIG_HUSH_PARSER     1 /* use "hush" command parser */
-#define CONFIG_BOOTDELAY       1
-#define CONFIG_BOOTCOMMAND     "boot_default"
+#define CONFIG_BOOTDELAY       1
+#define CONFIG_BOOTCOMMAND     "boot_default"
 
 /*
  * Miscellaneous configurable options
@@ -112,7 +118,6 @@
  */
 #define CONFIG_PCI                             /* include pci support          */
 #undef CONFIG_PCI_PNP
-#undef CFG_CMD_NET
 
 #define PCI_ENET0_IOADDR       0x80000000
 #define PCI_ENET0_MEMADDR      0x80000000
@@ -130,9 +135,9 @@
 
 #define CONFIG_LOGBUFFER
 #ifdef CONFIG_LOGBUFFER
-#define CFG_STDOUT_ADDR        0x1FFC000
+#define CFG_STDOUT_ADDR                0x1FFC000
 #else
-#define CFG_STDOUT_ADDR        0x2B9000
+#define CFG_STDOUT_ADDR                0x2B9000
 #endif
 
 #define CFG_RESET_ADDRESS      0xFFF00100
@@ -153,9 +158,9 @@
 
 #define CFG_GBL_DATA_SIZE      128
 
-#define CFG_INIT_RAM_ADDR     0x40000000
-#define CFG_INIT_RAM_END      0x1000
-#define CFG_GBL_DATA_OFFSET  (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_RAM_ADDR      0x40000000
+#define CFG_INIT_RAM_END       0x1000
+#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 
 #endif