Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / mimc200.h

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 66b9477aaf2d34c94157c669d8ca50d1fb305a50..8031a05fc818e9c4e8da8e75c4bcd7b9692cff65 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -103,7 +103,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP/DHCP options
@@ -130,7 +129,8 @@
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC
 #define CONFIG_MMC
-#define CONFIG_ATMEL_MCI
+#define CONFIG_GENERIC_ATMEL_MCI
+#define CONFIG_GENERIC_MMC
 
 #if defined(CONFIG_LCD)
 #define CONFIG_CMD_BMP
@@ -160,6 +160,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT              135
 
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
+#define CONFIG_SYS_TEXT_BASE           0x00000000
 
 #define CONFIG_SYS_INTRAM_BASE                 INTERNAL_SRAM_BASE
 #define CONFIG_SYS_INTRAM_SIZE                 INTERNAL_SRAM_SIZE