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 53fafdd6eaf1065a20753b63ed70774bb0f7d3fa..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
@@ -55,14 +55,14 @@
        "netboot=dhcp;tftp;run netargs; bootm\0"                        \
        "nfsargs=setenv bootargs root=/dev/nfs ip=dhcp\0"               \
        "localargs=setenv bootargs root=1F02 ip=dhcp\0"                 \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
                "read-only=readonly\0"                                  \
        "netargs=run nfsargs addmisc\0"                                 \
        "flash_nfs=run nfsargs addmisc;"                                \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_local=run localargs addmisc;"                            \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "netboot_initrd=dhcp;tftp;tftp 80600000 initrd;"                \
                "setenv bootargs root=/dev/ram ramdisk_size=8192 ip=dhcp;"\
                "run addmisc;"                                          \
@@ -73,27 +73,41 @@
        "ramdisk_addr=B0100000\0"                                       \
        "u-boot=u-boot.bin\0"                                           \
        "bootfile=uImage\0"                                             \
-       "load=dhcp;tftp 80400000 $(u-boot)\0"                           \
-       "load_kernel=dhcp;tftp 80400000 $(bootfile)\0"                  \
+       "load=dhcp;tftp 80400000 ${u-boot}\0"                           \
+       "load_kernel=dhcp;tftp 80400000 ${bootfile}\0"                  \
        "update_uboot=run load;"                                        \
                "protect off BFC00000 BFC3FFFF;"                        \
                "erase BFC00000 BFC3FFFF;"                              \
-               "cp.b 80400000 BFC00000 $(filesize)\0"                  \
+               "cp.b 80400000 BFC00000 ${filesize}\0"                  \
        "update_kernel=run load_kernel;"                                \
                "erase BFC60000 BFD5FFFF;"                              \
-               "cp.b 80400000 BFC60000 $(filesize)\0"                  \
+               "cp.b 80400000 BFC60000 ${filesize}\0"                  \
        "initenv=erase bfc40000 bfc5ffff\0"                             \
        ""
-//#define CONFIG_BOOTCOMMAND   "run flash_local"
+/*#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