Socrates: config file cleanup.

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

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index dac1eb736d8934ad8e6fd8a884465645d5b6e358..dadf5d3329f327c7799b2eb7183659925702c40f 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -43,10 +43,10 @@
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"boot\" for the network boot using DHCP, TFTP and NFS;" \
-       "echo Type \"run netboot_initrd\" for the network boot with initrd;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
-       "echo Type \"run flash_local\" to mount local root filesystem;" \
+       "echo Type \\\"boot\\\" for the network boot using DHCP, TFTP and NFS;" \
+       "echo Type \\\"run netboot_initrd\\\" for the network boot with initrd;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_local\\\" to mount local root filesystem;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -87,13 +87,27 @@
 /*#define CONFIG_BOOTCOMMAND   "run flash_local" */
 #define CONFIG_BOOTCOMMAND     "run netboot"
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_ASKENV | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_PING   | \
-                                CFG_CMD_PCI    | \
-                                CFG_CMD_ELF    )
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_ELF
+
 
 /*
  * Miscellaneous configurable options