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

[u-boot] / include / configs / hammerhead.h

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 5a2d14677f9787404fd8a6a90f0fb86ab8df912e..5570bdb468d6c3e7803d1932102a54d7e6f18647 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -97,7 +97,6 @@
  * "ethaddr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP/DHCP options
@@ -125,7 +124,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
 
 #define CONFIG_SYS_DCACHE_LINESZ               32
 #define CONFIG_SYS_ICACHE_LINESZ               32
@@ -141,6 +141,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                 0x24000000
 #define CONFIG_SYS_INTRAM_SIZE                 0x8000