projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
include
/
configs
/
hammerhead.h
diff --git
a/include/configs/hammerhead.h
b/include/configs/hammerhead.h
index bfdfc0a8c5029dabe2e727b0c48ce1746529449a..532feb2f6c9d19fe4308c9ffa863ce106153cbc6 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
* "ethaddr". This is normally done during production.
*/
#define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
/*
* BOOTP/DHCP options
/*
* BOOTP/DHCP options
@@
-125,7
+124,9
@@
#define CONFIG_SYS_NR_PIOS 5
#define CONFIG_SYS_HSDRAMC
#define CONFIG_MMC
#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_MMC_MAX_BLK_COUNT 1
#define CONFIG_SYS_DCACHE_LINESZ 32
#define CONFIG_SYS_ICACHE_LINESZ 32
#define CONFIG_SYS_DCACHE_LINESZ 32
#define CONFIG_SYS_ICACHE_LINESZ 32