Merge with /home/m8/git/u-boot

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

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 930ed2722d5fc896ab0c0537342956e841bda0be..f41dbd0ccb18f3f8a0f292fc30c8dc60e3cd2c8e 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -94,7 +94,11 @@
 
 #  define CONFIG_USB_OHCI
 #  define CONFIG_USB_CLOCK     0x0001bbbb
-#  define CONFIG_USB_CONFIG    0x00005000
+#  if defined (CONFIG_EVAL5200)
+#    define CONFIG_USB_CONFIG  0x00005100
+#  else
+#    define CONFIG_USB_CONFIG  0x00001000
+#  endif
 #  define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
 #  define CONFIG_DOS_PARTITION
 #  define CONFIG_USB_STORAGE
@@ -123,7 +127,7 @@
 #define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
                                ADD_PCI_CMD     | \
                                ADD_USB_CMD     | \
-                               ADD_IDE_CMD | \
+                               ADD_IDE_CMD     | \
                                CFG_CMD_ASKENV  | \
                                CFG_CMD_DATE    | \
                                CFG_CMD_DHCP    | \
@@ -163,16 +167,16 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\0"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
@@ -325,7 +329,7 @@
  * PCI disabled
  * Ethernet 100 with MD
  */
-#define CFG_GPS_PORT_CONFIG    0x00058444
+#define CFG_GPS_PORT_CONFIG    0x00058044
 
 /*
  * Miscellaneous configurable options