Merge git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 6687c38c992722ba965ebf23a34953fd12c0190d..4801cb22babd0f4d215c560dc28f05293473ec06 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -15,15 +15,6 @@
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 #include "mx6_common.h"
 
-/*
- * Console configuration
- */
-
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBIFS
-
 /*
  * Hardware configuration
  */
@@ -49,11 +40,7 @@
 #define CONFIG_MII
 #define IMX_FEC_BASE                           ENET_BASE_ADDR
 
-#define CONFIG_PHYLIB
-
 /* USB config */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORT                    1
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS                   0
@@ -94,7 +81,6 @@
 #define CONFIG_APBH_DMA_BURST8
 
 /* Environment in NAND */
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (16 << 20)
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
@@ -105,7 +91,6 @@
 
 /* Environment in MMC */
 #define CONFIG_ENV_SIZE                        (8 << 10)
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 
@@ -132,10 +117,8 @@
                                                 sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* MTD/UBI/UBIFS config */
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
 
 #if (CONFIG_SYS_NAND_MAX_CHIPS == 1)
 #define MTDIDS_DEFAULT         "nand0=gpmi-nand"