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

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

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 153466a..7fec24c 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -19,14 +19,6 @@
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
-#define CONFIG_DISPLAY_CPUINFO
-
-/* Only in case the value is not present in mach-types.h */
-#ifndef MACH_TYPE_FLEA3
-#define MACH_TYPE_FLEA3                3668
-#endif
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_FLEA3
 
@@ -63,8 +55,6 @@
 #define CONFIG_RTC_MC13XXX
 
 /* mmc driver */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
@@ -90,9 +80,6 @@
 
 #define CONFIG_CMD_NAND
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 #define CONFIG_MXC_GPIO
 
 #define CONFIG_NET_RETRY_COUNT 100