diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-26 07:54:25 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-26 07:54:25 +0200 |
| commit | 4c25761337570e63e9e2631a81de221e692251e3 (patch) | |
| tree | f288433990a6bec1c42261690ac573d0316f3d48 /include | |
| parent | c68436fa427a69ea308d74c410067507d6c7103b (diff) | |
| parent | 9924ca6e9b1933b8ea2bb0ca49fe67df9856ccc5 (diff) | |
Merge remote-tracking branch 'u-boot-atmel/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/atmel_mci.h | 7 | ||||
| -rw-r--r-- | include/configs/at91sam9x5ek.h | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/atmel_mci.h b/include/atmel_mci.h index 3dd5d67be..c71188127 100644 --- a/include/atmel_mci.h +++ b/include/atmel_mci.h @@ -38,7 +38,7 @@ typedef struct atmel_mci { u32 sdcr; /* 0x0c */ u32 argr; /* 0x10 */ u32 cmdr; /* 0x14 */ - u32 _18; /* 0x18 */ + u32 blkr; /* 0x18 */ u32 _1c; /* 0x1c */ u32 rspr; /* 0x20 */ u32 rspr1; /* 0x24 */ @@ -118,6 +118,11 @@ typedef struct atmel_mci { #define MMCI_TRTYP_OFFSET 19 #define MMCI_TRTYP_SIZE 2 +/* Bitfields in BLKR */ +/* MMCI_BLKLEN_OFFSET/SIZE already defined in MR */ +#define MMCI_BCNT_OFFSET 0 +#define MMCI_BCNT_SIZE 16 + /* Bitfields in RSPRx */ #define MMCI_RSP_OFFSET 0 #define MMCI_RSP_SIZE 32 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index cbdc3e93c..71f765b49 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -89,6 +89,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND #define CONFIG_CMD_SF +#define CONFIG_CMD_MMC /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -138,6 +139,15 @@ #define CONFIG_CMD_UBIFS #endif +/* MMC */ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MMC +#define CONFIG_CMD_FAT +#define CONFIG_GENERIC_MMC +#define CONFIG_GENERIC_ATMEL_MCI +#define CONFIG_DOS_PARTITION +#endif + /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII |