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

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

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index ab69c45..fca607c 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -77,14 +77,12 @@
 #ifdef CONFIG_SDCARD
 #define CONFIG_RAMBOOT_SDCARD
 #define CONFIG_SYS_RAMBOOT
-#define CONFIG_SYS_EXTRA_ENV_RELOC
 #define CONFIG_RESET_VECTOR_ADDRESS    0x1107fffc
 #endif
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RAMBOOT_SPIFLASH
 #define CONFIG_SYS_RAMBOOT
-#define CONFIG_SYS_EXTRA_ENV_RELOC
 #define CONFIG_RESET_VECTOR_ADDRESS    0x1107fffc
 #endif
 
@@ -442,7 +440,6 @@
 
 #define CONFIG_BOOTP_SERVERIP
 
-#define CONFIG_MII             /* MII PHY management */
 #define CONFIG_TSEC1_NAME      "eTSEC1"
 #define CONFIG_TSEC2_NAME      "eTSEC2"
 #define CONFIG_TSEC3_NAME      "eTSEC3"