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

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

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 9e5c29f92f2cf33273f7b57a77b3cce8c1310f78..8eb248ac89840258afa3cea61698325926482e0e 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -8,13 +8,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
 #define CONFIG_SPL_OS_BOOT
@@ -46,7 +44,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
@@ -81,26 +78,10 @@
 #define CONFIG_SYS_FLASH_BANKS_SIZES   { (32 * SZ_1M) }
 
 /* MTD support */
-#define CONFIG_CMD_MTDPARTS
 #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_EHCI
-#define CONFIG_USB_EHCI_MX6
-#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
@@ -112,9 +93,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_MICREL_KSZ9031
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -149,7 +127,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" \
@@ -162,7 +140,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;" \
@@ -194,7 +172,7 @@
                          "fi;" \
                     "fi;" \
                "fi\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr=0x18000000\0" \
        "bootdev=1\0" \
        "bootpart=1\0" \
@@ -317,7 +295,6 @@
 #define CONFIG_ENV_SIZE                        (SZ_128K)
 
 /* Envs are stored in NOR flash */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE    (SZ_128K)
 #define CONFIG_ENV_ADDR        (CONFIG_SYS_FLASH_BASE + 0x40000)