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

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

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 41376da..e1febf3 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -60,6 +60,7 @@
 /* check for keypress on bootdelay==0 */
 /*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
 
+#define CONFIG_SYS_TEXT_BASE           0x0FFC0000
 #define CONFIG_SYS_SDRAM_BASE          (0x08000000)
 #define CONFIG_SYS_SDRAM_SIZE          (128 * 1024 * 1024)
 
@@ -101,7 +102,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (1204 * 1024)
 
 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       (256)
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 #define CONFIG_SYS_RX_ETH_BUFFER       (8)
 
@@ -155,7 +155,6 @@
 #define CONFIG_RTL8169
 */
 /* AX88796L Support(NE2000 base chip) */
-#define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_AX88796L
 #define CONFIG_DRIVER_NE2000_BASE      0xA4100000
 #endif