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/atstk1003.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/atstk1003.h')
-rw-r--r-- | include/configs/atstk1003.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index c5e357f..817d943 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -100,7 +100,7 @@ "console=ttyS0 root=/dev/mmcblk0p1 rootwait" #define CONFIG_BOOTCOMMAND \ - "mmcinit; ext2load mmc 0:1 0x10400000 /boot/uImage; bootm" + "mmc rescan; ext2load mmc 0:1 0x10400000 /boot/uImage; bootm" /* * Only interrupt autoboot if <space> is pressed. Otherwise, garbage @@ -135,7 +135,9 @@ #define CONFIG_PORTMUX_PIO #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 |