Merge branch 'master' of git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 89aa11c..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 */