Change all '$(...)' variable references into '${...}'

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

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 0bbf41c..2c160a4 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -92,16 +92,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_6xx\0"                                  \
        "bootfile=/tftpboot/canmb/uImage\0"                             \
        ""
@@ -129,18 +129,6 @@
 #define CFG_FLASH_EMPTY_INFO
 
 /*
- * DRAM configuration
- */
-#define        CFG_DRAM_DDR            0
-#define CFG_DRAM_EMODE         0
-#define CFG_DRAM_MODE          0x00CD
-#define CFG_DRAM_CONTROL       0x514F0000
-#define CFG_DRAM_CONFIG1       0xD2333A00
-#define CFG_DRAM_CONFIG2       0x8AD70004
-#define        CFG_DRAM_TAP_DEL        0x08
-#define CFG_DRAM_RAM_SIZE      0x19
-
-/*
  * Environment settings
  */
 #define CFG_ENV_IS_IN_FLASH    1
@@ -179,7 +167,7 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC5xxx_FEC     1
-#define        CONFIG_PHY_ADDR         0x1
+#define        CONFIG_PHY_ADDR         0x0
 /*
  * GPIO configuration:
  * PSC1,2,3 predefined as UART