Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#mpc8349ads

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

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 8fc7c30..d671dcc 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -238,26 +238,26 @@
 /* Define a command string that is automatically executed when no character
  * is read on the console interface withing "Boot Delay" after reset.
  */
-#define CONFIG_BOOT_ROOT_INITRD 0      /* Use ram disk for the root file system */
-#define CONFIG_BOOT_ROOT_NFS   1       /* Use a NFS mounted root file system */
+#undef CONFIG_BOOT_ROOT_INITRD         /* Use ram disk for the root file system */
+#define        CONFIG_BOOT_ROOT_NFS            /* Use a NFS mounted root file system */
 
-#if CONFIG_BOOT_ROOT_INITRD
+#ifdef CONFIG_BOOT_ROOT_INITRD
 #define CONFIG_BOOTCOMMAND \
        "version;" \
        "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 */
 
-#if CONFIG_BOOT_ROOT_NFS
+#ifdef CONFIG_BOOT_ROOT_NFS
 #define CONFIG_BOOTCOMMAND \
        "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 */
 
@@ -279,7 +279,6 @@
 #define CONFIG_COMMANDS                (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_REGINFO | \
                                CFG_CMD_MEMTEST | \
                                CFG_CMD_MII     | \
@@ -297,6 +296,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_PPMC8260                1       /* on an Wind River PPMC8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>