Big white-space cleanup.

[platform/kernel/u-boot.git] / include / configs / utx8245.h

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 4c4c279..287a618 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -58,7 +58,7 @@
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY       2
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
 #define CONFIG_BOOTCOMMAND     "run nfsboot"   /* autoboot command     */
 #define CONFIG_BOOTARGS                "root=/dev/ram console=ttyS0,57600" /* RAMdisk */
 #define CONFIG_ETHADDR         00:AA:00:14:00:05       /* UTX5 */
@@ -70,35 +70,52 @@
        "ramdisk_addr=FF800000\0" \
        "u-boot_startaddr=FFB00000\0" \
        "u-boot_endaddr=FFB2FFFF\0" \
-       "nfsargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/nfs rw \
-nfsroot=$(nfsrootip):$(rootpath) ip=dhcp\0" \
-       "ramargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/ram0\0" \
-       "smargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/mtdblock1 ro\0" \
-       "fwargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/sda2 ro\0" \
-       "nfsboot=run nfsargs;bootm $(kernel_addr)\0" \
-       "ramboot=run ramargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "smboot=run smargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "fwboot=run fwargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "update_u-boot=tftp $(loadaddr) /bdi2000/u-boot.bin;protect off \
-$(u-boot_startaddr) $(u-boot_endaddr);era $(u-boot_startaddr) \
-$(u-boot_endaddr);cp.b $(loadaddr) $(u-boot_startaddr) $(filesize);\
-protect on $(u-boot_startaddr) $(u-boot_endaddr)"
+       "nfsargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/nfs rw \
+nfsroot=${nfsrootip}:${rootpath} ip=dhcp\0" \
+       "ramargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/ram0\0" \
+       "smargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/mtdblock1 ro\0" \
+       "fwargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/sda2 ro\0" \
+       "nfsboot=run nfsargs;bootm ${kernel_addr}\0" \
+       "ramboot=run ramargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "smboot=run smargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "fwboot=run fwargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "update_u-boot=tftp ${loadaddr} /bdi2000/u-boot.bin;protect off \
+${u-boot_startaddr} ${u-boot_endaddr};era ${u-boot_startaddr} \
+${u-boot_endaddr};cp.b ${loadaddr} ${u-boot_startaddr} ${filesize};\
+protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_COMMANDS                (CFG_CMD_DFL | CFG_CMD_BDI | CFG_CMD_PCI \
-                                                               | CFG_CMD_FLASH | CFG_CMD_MEMORY \
-                                                               | CFG_CMD_ENV | CFG_CMD_CONSOLE \
-                                                               | CFG_CMD_LOADS | CFG_CMD_LOADB \
-                                                               | CFG_CMD_IMI | CFG_CMD_CACHE \
-                                                               | CFG_CMD_RUN | CFG_CMD_ECHO \
-                                                               | CFG_CMD_REGINFO | CFG_CMD_NET\
-                                                               | CFG_CMD_DHCP | CFG_CMD_I2C \
-                                                               | CFG_CMD_DATE)
-
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
  */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_CONSOLE
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_DATE
 
 
 /*
@@ -238,7 +255,7 @@ protect on $(u-boot_startaddr) $(u-boot_endaddr)"
                                                                        mem_freq = 100MHz */
 
 #define CFG_BANK7_ROW  0               /* SDRAM bank 7-0 row address */
-#define CFG_BANK6_ROW  0               /*      bit count */
+#define CFG_BANK6_ROW  0               /*      bit count */
 #define CFG_BANK5_ROW  0
 #define CFG_BANK4_ROW  0
 #define CFG_BANK3_ROW  0
@@ -261,7 +278,7 @@ protect on $(u-boot_startaddr) $(u-boot_endaddr)"
 #define CFG_ACTTOPRE       7       /* trcd + (burst length - 1) + trdl */
 #define CFG_SDMODE_CAS_LAT  3      /* SDMODE CAS latancy */
 #define CFG_SDMODE_WRAP            0       /* SDMODE wrap type, sequential */
-#define CFG_ACTORW             2               /* trcd min */
+#define CFG_ACTORW             2               /* trcd min */
 #define CFG_DBUS_SIZE2         1               /* set for 8-bit RCS1, clear for 32,64 */
 #define CFG_REGISTERD_TYPE_BUFFER 1
 #define CFG_EXTROM         0                   /* we don't need extended ROM space */
@@ -404,7 +421,7 @@ protect on $(u-boot_startaddr) $(u-boot_endaddr)"
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value        */
 #endif