Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / include / configs / mccmon6.h

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 7ea983991a3d300728bbed6aa6a18f744fd7e938..ed5f53f59795c8afe2255caa9f5331b2ae000595 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  2
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000
@@ -83,20 +82,7 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_DEFAULT                  "nor0=8000000.nor"
-#define MTDPARTS_DEFAULT  \
-       "mtdparts=8000000.nor:" \
-       "32m@0x0(mccmon6-image.nor)," \
-       "256k@0x40000(u-boot-env.nor)," \
-       "1m@0x80000(u-boot.nor)," \
-       "8m@0x180000(kernel.nor)," \
-       "8m@0x980000(swupdate-kernel.nor)," \
-       "8m@0x1180000(swupdate-rootfs.nor)," \
-       "128k@0x1980000(kernel-dtb.nor)," \
-       "128k@0x19C0000(swupdate-kernel-dtb.nor)"
-
 /* USB Configs */
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
@@ -142,7 +128,7 @@
                "setenv kernelnor 0x08180000;" \
                "setenv dtbnor 0x09980000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
                "cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
                "bootm ${kernelnor} - ${dtbloadaddr};\0" \
@@ -155,7 +141,7 @@
                "setenv swurootfsnor 0x09180000;" \
                "setenv swudtbnor 0x099A0000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
                    ":${hostname}::off root=/dev/ram rw;" \
                "cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \
@@ -187,7 +173,7 @@
                          "fi;" \
                     "fi;" \
                "fi\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr=0x18000000\0" \
        "bootdev=1\0" \
        "bootpart=1\0" \