diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:50:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:50:59 +0100 |
| commit | 6e94125f9ccde8e7f8f94902b8d253bda5bb68c8 (patch) | |
| tree | 689b740e1d175a5d2dfbce89d2ebb0e9350a1da3 /include/configs/hammerhead.h | |
| parent | 6ae38b8c583c61f00c2fe9904cafa81932c7faaf (diff) | |
| parent | a7a564c55c3b53e5af091b82070ca1f67cba70f7 (diff) | |
| download | u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.zip u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.tar.gz u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-avr32
* 'master' of git://git.denx.de/u-boot-avr32:
atmel_mci.h: remove outdated register macros
doc/git-mailrc: add <me> to avr32 alias
ATMEL: remove old atmel_mci driver
ATMEL: use generic mmc framework
Diffstat (limited to 'include/configs/hammerhead.h')
| -rw-r--r-- | include/configs/hammerhead.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 94e680c..532feb2 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -124,7 +124,9 @@ #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 |