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

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

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index ea980e651171975a27cba36bbf0bba1e4e288e8b..892ceff5e6402099f63b3d29cfd4b8c803250c04 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -30,7 +30,6 @@
  * NET options
  */
 #define CONFIG_SYS_RX_ETH_BUFFER       0
-#define CONFIG_PHY_GIGE
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 #define CONFIG_PHY_MARVELL
 
@@ -70,7 +69,6 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  */
-#define CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
 #define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */