include/configs/[p-z]* + misc: Cleanup BOOTP and lingering CFG_CMD_*.

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index bbd823a..e0a827f 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -37,28 +37,35 @@
 
 
 /*
- * Supported commands
- */
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                               CFG_CMD_ASKENV  | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_REGINFO | \
-                               CFG_CMD_IMMAP   | \
-                               CFG_CMD_ELF     | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_BEDBUG  | \
-                               CFG_CMD_NET     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_IDE     | \
-                               CFG_CMD_FAT     | \
-                               CFG_CMD_JFFS2   | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_DTT)
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_DTT
 
 
 /*
@@ -117,26 +124,27 @@
        "fdt_file=/tftpboot/motionpro/motionpro.dtb\0"                  \
        "ramdisk_file=/tftpboot/motionpro/uRamdisk\0"                   \
        "multi_image_file=kernel+initrd+dtb.img\0"                      \
-       "load=tftp $(u-boot_addr) $(u-boot)\0"                          \
+       "load=tftp ${u-boot_addr} ${u-boot}\0"                          \
        "update=prot off fff00000 fff3ffff; era fff00000 fff3ffff; "    \
-               "cp.b $(u-boot_addr) fff00000 $(filesize);"             \
+               "cp.b ${u-boot_addr} fff00000 ${filesize};"             \
                "prot on fff00000 fff3ffff\0"                           \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "fat_args=setenv bootargs rw\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; "     \
-               "bootm $(kernel_addr) - $(fdt_addr)\0"                  \
-       "net_self=tftp $(kernel_addr) $(bootfile); "                    \
-               "tftp $(fdt_addr) $(fdt_file); "                        \
-               "tftp $(ramdisk_addr) $(ramdisk_file); "                \
+       "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; "     \
+               "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"    \
+               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
        "fat_multi=run fat_args addip; fatload ide 0:1 "                \
                "${multi_image_addr} ${multi_image_file}; "             \
                "bootm ${multi_image_addr}\0"                           \
@@ -269,7 +277,8 @@
 #define MTDIDS_DEFAULT         "nor0=motionpro-0"
 #define MTDPARTS_DEFAULT       "mtdparts=motionpro-0:"                   \
                                        "13m(fs),2m(kernel),256k(uboot)," \
-                                       "64k(env),64k(dtb),-(user_data)"
+                                       "64k(env),64k(redund_env),64k(dtb)," \
+                                       "-(user_data)"
 
 /*
  * IDE/ATA configuration
@@ -349,6 +358,9 @@ extern void __led_set(led_id_t id, int state);
 #define CFG_ENV_SIZE           0x1000
 #define CFG_ENV_SECT_SIZE      0x10000
 
+/* Configuration of redundant environment */
+#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
+#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 
 /*
  * Pin multiplexing configuration
@@ -413,6 +425,6 @@ extern void __led_set(led_id_t id, int state);
 #define OF_CPU                 "PowerPC,5200@0"
 #define OF_SOC                 "soc5200@f0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
-#define OF_STDOUT_PAT          "/soc5200@f0000000/serial@2000"
+#define OF_STDOUT_PATH         "/soc5200@f0000000/serial@2000"
 
 #endif /* __CONFIG_H */