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

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

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 1b17cccce22c58606898a2d940be60e6bf82ea90..2b7a5d7c5cfb9fd746e06162cc2c2e987e30966a 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -24,8 +24,6 @@
 #define CONFIG_SPL_BSS_MAX_SIZE                0x0001ffff
 #define CONFIG_SYS_SPL_MALLOC_START    0x00040000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x0001ffff
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/orion5x/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_UBOOT_BASE          0xfff90000
 #define CONFIG_SYS_UBOOT_START         0x00800000
 #define CONFIG_SYS_TEXT_BASE           0x00800000
@@ -115,12 +113,9 @@
 #define CONFIG_SETUP_MEMORY_TAGS 1     /* enable memory tag */
 
 #define        CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
-#define        CONFIG_SYS_PBSIZE       (CONFIG_SYS_CBSIZE \
-               +sizeof(CONFIG_SYS_PROMPT) + 16)        /* Print Buff */
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_IDE
 
 /*
  * Network
@@ -141,11 +136,10 @@
 /*
  * IDE
  */
-#ifdef CONFIG_CMD_IDE
+#ifdef CONFIG_IDE
 #define __io
 #define CONFIG_IDE_PREINIT
 /* ED Mini V has an IDE-compatible SATA connector for port 1 */
-#define CONFIG_MVSATA_IDE
 #define CONFIG_MVSATA_IDE_USE_PORT1
 /* Needs byte-swapping for ATA data register */
 #define CONFIG_IDE_SWAP_IO
@@ -171,8 +165,6 @@
  * Common USB/EHCI configuration
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD            /* Enable EHCI USB support */
-#define CONFIG_USB_EHCI_MARVELL
 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
@@ -191,7 +183,6 @@
 /*
  *  Environment variables configurations
  */
-#define CONFIG_ENV_IS_IN_FLASH         1
 #define CONFIG_ENV_SECT_SIZE           0x2000  /* 16K */
 #define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_ENV_OFFSET              0x4000  /* env starts here */
@@ -211,7 +202,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x00400000
 #define CONFIG_SYS_MEMTEST_END         0x007fffff
 #define CONFIG_SYS_RESET_ADDRESS       0xffff0000
-#define CONFIG_SYS_MAXARGS             16
 
 /* Enable command line editing */
 #define CONFIG_CMDLINE_EDITING