Socrates: config file cleanup.

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

diff --git a/include/configs/atc.h b/include/configs/atc.h
index cb4e7472ec74c7de4c12ec504199946e3924c53b..285b4e4da00970253cc8d3a75e8b5884d9fdf984 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -64,9 +64,7 @@
  * for FCC)
  *
  * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
- * defined elsewhere (as for the console), or CFG_CMD_NET must be removed
- * from CONFIG_COMMANDS to remove support for networking.
- *
+ * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.
  */
 #undef CONFIG_ETHER_ON_SCC             /* define if ether on SCC       */
 #undef CONFIG_ETHER_NONE               /* define if ether on something else */
@@ -106,14 +104,14 @@
 
 #define CONFIG_PREBOOT                                                 \
        "echo;"                                                         \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;"\
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;"\
        "echo"
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                             \
        "bootp;"                                                        \
        "setenv bootargs root=/dev/nfs rw "                             \
-       "nfsroot=${serverip}:${rootpath} "                              \
+       "nfsroot=${serverip}:${rootpath} "                              \
        "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"\
        "bootm"
 
@@ -124,7 +122,15 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #undef CFG_LOADS_BAUD_CHANGE           /* don't allow baudrate change  */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
 
 
 /*
@@ -176,9 +182,9 @@
 
 #define CONFIG_RTC_DS12887
 
-#define RTC_BASE_ADDR          0xF5000000
-#define RTC_PORT_ADDR          RTC_BASE_ADDR + 0x800
-#define RTC_PORT_DATA          RTC_BASE_ADDR + 0x808
+#define RTC_BASE_ADDR          0xF5000000
+#define RTC_PORT_ADDR          RTC_BASE_ADDR + 0x800
+#define RTC_PORT_DATA          RTC_BASE_ADDR + 0x808
 
 #define CONFIG_MISC_INIT_R