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

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

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index f9d4683fcbee5a2f5dc971e90d7a4d40a30d2952..1f43dc0ba4acc07c4222760425aea345abef8383 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -17,10 +17,6 @@
  */
 
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_NOR_SUPPORT
 #define CONFIG_SPL_TEXT_BASE           0xffff0000
 #define CONFIG_SPL_MAX_SIZE            0x0000fff0
 #define CONFIG_SPL_STACK               0x00020000
@@ -34,12 +30,6 @@
 #define CONFIG_SYS_UBOOT_START         0x00800000
 #define CONFIG_SYS_TEXT_BASE           0x00800000
 
-/*
- * Version number information
- */
-
-#define CONFIG_IDENT_STRING    " EDMiniV2"
-
 /*
  * High Level Configuration Options (easy to change)
  */
@@ -186,7 +176,6 @@
 #define CONFIG_USB_EHCI                /* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_MARVELL
 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
-#define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION
 #define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_VFAT
@@ -219,10 +208,7 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_CONSOLE_INFO_QUIET      /* some code reduction */
 #define CONFIG_ARCH_CPU_INIT           /* call arch_cpu_init() */
-#define CONFIG_ARCH_MISC_INIT          /* call arch_misc_init() */
-#define CONFIG_DISPLAY_CPUINFO         /* Display cpu info */
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CONFIG_SYS_LOAD_ADDR           0x00800000