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

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

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 644f42a..a608c0f 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -15,7 +15,6 @@
  * SPL
  */
 
-#define CONFIG_SPL_TEXT_BASE           0xffff0000
 #define CONFIG_SPL_MAX_SIZE            0x0000fff0
 #define CONFIG_SPL_STACK               0x00020000
 #define CONFIG_SPL_BSS_START_ADDR      0x00020000
@@ -29,7 +28,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_MARVELL         1
 #define CONFIG_FEROCEON                1       /* CPU Core subversion */
 #define CONFIG_88F5182         1       /* SOC Name */
 
@@ -90,8 +88,6 @@
  * FLASH configuration
  */
 
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_MAX_FLASH_BANKS     1  /* max num of flash banks       */
 #define CONFIG_SYS_MAX_FLASH_SECT      11 /* max num of sects on one chip */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000