diff options
| author | Tom Rini <[email protected]> | 2012-10-22 16:53:19 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2012-10-22 16:53:19 -0700 |
| commit | bdc3ff6e4f75813d01e51081799d10e4a9c7fbcb (patch) | |
| tree | d698085ec89351f4c63ad8f4a2022f29ea3e93e0 /include/configs | |
| parent | bcf28c23f2195a91e0713337934f630a9c7bc5a9 (diff) | |
| parent | 757bff49ba3159d71ccacabdb68f8309b1eb6613 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mmc
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/apx4devkit.h | 2 | ||||
| -rw-r--r-- | include/configs/lubbock.h | 3 | ||||
| -rw-r--r-- | include/configs/m28evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx28evk.h | 2 | ||||
| -rw-r--r-- | include/configs/palmtc.h | 3 | ||||
| -rw-r--r-- | include/configs/pxa255_idp.h | 3 | ||||
| -rw-r--r-- | include/configs/trizepsiv.h | 3 |
7 files changed, 11 insertions, 7 deletions
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index af0b714e11a..6764b4749c9 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -132,7 +132,7 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_MMC_BOUNCE_BUFFER +#define CONFIG_BOUNCE_BUFFER #define CONFIG_MXS_MMC #endif diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index ed64960879b..5886a155dcb 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -130,7 +130,8 @@ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #ifdef CONFIG_MMC -#define CONFIG_PXA_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_PXA_MMC_GENERIC #define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 #endif diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index bdbb82065e5..b49ec8c7dd6 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -135,7 +135,7 @@ */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC -#define CONFIG_MMC_BOUNCE_BUFFER +#define CONFIG_BOUNCE_BUFFER #define CONFIG_GENERIC_MMC #define CONFIG_MXS_MMC #endif diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 7cdbec68dea..1443833c832 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -142,7 +142,7 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_MMC_BOUNCE_BUFFER +#define CONFIG_BOUNCE_BUFFER #define CONFIG_MXS_MMC #endif diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h index 6e8d8e9d573..9c948c54735 100644 --- a/include/configs/palmtc.h +++ b/include/configs/palmtc.h @@ -77,7 +77,8 @@ */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC -#define CONFIG_PXA_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_PXA_MMC_GENERIC #define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index 24c53633f06..5a15af6b6a9 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -245,7 +245,8 @@ #define RTC 1 /* enable 32KHz osc */ #ifdef CONFIG_MMC -#define CONFIG_PXA_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_PXA_MMC_GENERIC #define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 #endif diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index bc69c1ea2b7..c1bfe31e462 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -170,7 +170,8 @@ #define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ #ifdef CONFIG_MMC -#define CONFIG_PXA_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_PXA_MMC_GENERIC #define CONFIG_CMD_MMC #define CONFIG_SYS_MMC_BASE 0xF0000000 #endif |