Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash

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

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 98facf2..59ff96b 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -89,36 +89,35 @@
 /*
  * Default environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       "netdev=eth0\0"                                                 \
-       "u-boot_addr=100000\0"                                          \
-       "kernel_addr=200000\0"                                          \
-       "fdt_addr=400000\0"                                             \
-       "rootpath=/opt/eldk-4.2/ppc_82xx\0"                             \
-       "u-boot=/tftpboot/mgcoge/u-boot.bin\0"                          \
-       "bootfile=/tftpboot/mgcoge/uImage\0"                            \
-       "fdt_file=/tftpboot/mgcoge/mgcoge.dtb\0"                        \
-       "load=tftp ${u-boot_addr} ${u-boot}\0"                          \
-       "update=prot off fe000000 fe03ffff; era fe000000 fe03ffff; "    \
-               "cp.b ${u-boot_addr} fe000000 ${filesize};"             \
-               "prot on fe000000 fe03ffff\0"                           \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
-       "addcon=setenv bootargs ${bootargs} console=ttyCPM0,,${baudrate}\0"     \
-       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "addip=setenv bootargs ${bootargs} "                            \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:"                \
-               "${netmask}:${hostname}:${netdev}:off panic=1 "         \
-               "console=${console}\0"                                  \
-       "net_nfs=tftp ${kernel_addr} ${bootfile}; "                     \
-               "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcon;"\
-               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
-       "net_self=tftp ${kernel_addr} ${bootfile}; "                    \
-               "tftp ${fdt_addr} ${fdt_file}; "                        \
-               "tftp ${ramdisk_addr} ${ramdisk_file}; "                \
-               "run ramargs addip; "                                   \
-               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
+#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+       "netdev=eth0\0"                                                         \
+       "u-boot_addr=100000\0"                                                  \
+       "kernel_addr=200000\0"                                                  \
+       "fdt_addr=400000\0"                                                     \
+       "rootpath=/opt/eldk-4.2/ppc_82xx\0"                                     \
+       "u-boot=/tftpboot/mgcoge/u-boot.bin\0"                                  \
+       "bootfile=/tftpboot/mgcoge/uImage\0"                                    \
+       "fdt_file=/tftpboot/mgcoge/mgcoge.dtb\0"                                \
+       "load=tftp ${u-boot_addr} ${u-boot}\0"                                  \
+       "update=prot off fe000000 fe03ffff; era fe000000 fe03ffff; "            \
+               "cp.b ${u-boot_addr} fe000000 ${filesize};"                     \
+               "prot on fe000000 fe03ffff\0"                                   \
+       "ramargs=setenv bootargs root=/dev/ram rw\0"                            \
+       "nfsargs=setenv bootargs root=/dev/nfs rw "                             \
+               "nfsroot=${serverip}:${rootpath}\0"                             \
+       "addcons=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0"     \
+       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"                      \
+       "addip=setenv bootargs ${bootargs} "                                    \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:"                        \
+               "${netmask}:${hostname}:${netdev}:off panic=1\0"                \
+       "net_nfs=tftp ${kernel_addr} ${bootfile}; "                             \
+               "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"      \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                          \
+       "net_self=tftp ${kernel_addr} ${bootfile}; "                            \
+               "tftp ${fdt_addr} ${fdt_file}; "                                \
+               "tftp ${ramdisk_addr} ${ramdisk_file}; "                        \
+               "run ramargs addip; "                                           \
+               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"            \
        ""
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
@@ -189,13 +188,13 @@
 #define CFG_HRCW_MASTER                0x0604b211
 
 /* No slaves */
-#define CFG_HRCW_SLAVE1        0
-#define CFG_HRCW_SLAVE2        0
-#define CFG_HRCW_SLAVE3        0
-#define CFG_HRCW_SLAVE4        0
-#define CFG_HRCW_SLAVE5        0
-#define CFG_HRCW_SLAVE6        0
-#define CFG_HRCW_SLAVE7        0
+#define CFG_HRCW_SLAVE1                0
+#define CFG_HRCW_SLAVE2                0
+#define CFG_HRCW_SLAVE3                0
+#define CFG_HRCW_SLAVE4                0
+#define CFG_HRCW_SLAVE5                0
+#define CFG_HRCW_SLAVE6                0
+#define CFG_HRCW_SLAVE7                0
 
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                  */