Merge branch 'next'

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

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 3b4d1fd..9b4f5fc 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -23,15 +23,8 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 
 /*
- * NET options
- */
-#define CONFIG_SYS_RX_ETH_BUFFER       0
-#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-
-/*
  * BOOTP options
  */
-#define CONFIG_BOOTP_BOOTFILESIZE
 
 /*
  * MEMORY ORGANIZATION
@@ -43,8 +36,5 @@
 #define CONFIG_SYS_SDRAM_SIZE          0x08000000
 #define CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_SYS_MONITOR_LEN         0x80000 /* Reserve 512k */
-#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_SDRAM_BASE + \
-                                        CONFIG_SYS_SDRAM_SIZE - \
-                                        CONFIG_SYS_MONITOR_LEN)
 
 #endif /* __CONFIG_H */