Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index bd32cdbf735d42b8888ff9eabe5be0bcb16f3c7e..a3c40d68aa5266057fcbd0ba897c2838bdcb831a 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -19,11 +19,9 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
 /* Set our official architecture number. */
-#define MACH_TYPE_ETHERNUT5 1971
 #define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
 
 /* CPU information */
-#define CONFIG_DISPLAY_CPUINFO         /* Display at console. */
 #define CONFIG_ARCH_CPU_INIT
 
 /* ARM asynchronous clock */
@@ -96,7 +94,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_REISER
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_UNZIP
 #endif
@@ -129,8 +126,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define CONFIG_SYS_MMC_CD_PIN          AT91_PIO_PORTC, 8
 #endif
@@ -144,7 +139,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE  0x00500000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME  "host"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE
 #endif
 
 /* RTC */
@@ -197,10 +191,6 @@
 #define MTDIDS_DEFAULT         "nand0=atmel_nand"
 #define MTDPARTS_DEFAULT       "mtdparts=atmel_nand:-(root)"
 #endif
-#if defined(CONFIG_CMD_REISER) || defined(CONFIG_CMD_EXT2) || \
-       defined(CONFIG_CMD_USB) || defined(CONFIG_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
 #define CONFIG_LZO
 #define CONFIG_RBTREE