SPC1920: update the HPI register addresses to work with the second

[u-boot] / include / configs / sbc8260.h

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 251d62a70b359cfaa89963db575becb5bd7b0d67..9cf0654be10e19555fe74f2d1a055af45b0f57d3 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -336,30 +336,30 @@
  *
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/nfs rw
- * nfsroot=$(serverip):$(rootpath)
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * nfsroot=${serverip}:${rootpath}
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  * => run root-on-initrd
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/ram0 rw
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  * => run root-on-nfs
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/nfs rw
- * nfsroot=$(serverip):$(rootpath)
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * nfsroot=${serverip}:${rootpath}
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "serverip=192.168.123.205\0\0" \
+       "serverip=192.168.123.205\0" \
        "ipaddr=192.168.123.213\0" \
        "reprog="\
                "bootp;" \
                "tftpboot 0x140000 /bdi2000/u-boot.bin;" \
                "protect off 1:0;" \
                "erase 1:0;" \
-               "cp.b 140000 40000000 $(filesize);" \
+               "cp.b 140000 40000000 ${filesize};" \
                "protect on 1:0\0" \
        "zapenv="\
                "protect off 1:1;" \
@@ -371,7 +371,7 @@
                "echo;" \
                "bootp;" \
                "setenv bootargs root=/dev/ram0 rw " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
                "run boot-hook;" \
                "bootm\0" \
        "root-on-nfs="\
@@ -380,8 +380,8 @@
                "echo;" \
                "bootp;" \
                "setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+               "nfsroot=${serverip}:${rootpath} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
                "run boot-hook;" \
                "bootm\0" \
        "boot-hook=echo\0"
@@ -398,7 +398,7 @@
        "echo;" \
        "bootp;" \
        "setenv bootargs root=/dev/ram0 rw " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
 
@@ -407,8 +407,8 @@
        "version;" \
        "echo;" \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_NFS */
 
@@ -448,7 +448,6 @@
 #ifdef CONFIG_ETHER_ON_FCC
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IMMAP   | \
@@ -459,7 +458,6 @@
 #else
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IMMAP   | \
@@ -481,6 +479,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_SBC8260         1       /* on an EST SBC8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>