diff options
| author | Tom Rini <trini@ti.com> | 2014-02-17 14:16:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-17 14:16:08 -0500 |
| commit | 18c83588bc830dbad5a96ca19a85184da58f4d09 (patch) | |
| tree | 6c6828f97876aa9974f29d2c8f5f248b8188a172 /include | |
| parent | 22a240c32c1340183fce12867ae5f8736b92a638 (diff) | |
| parent | b818d9ab8d96471c40ccbd4541a46dfa415eda73 (diff) | |
| download | blackbird-obmc-uboot-18c83588bc830dbad5a96ca19a85184da58f4d09.tar.gz blackbird-obmc-uboot-18c83588bc830dbad5a96ca19a85184da58f4d09.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/dra7xx_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/omap5_uevm.h | 1 | ||||
| -rw-r--r-- | include/dwmmc.h | 2 | ||||
| -rw-r--r-- | include/mmc.h | 9 | ||||
| -rw-r--r-- | include/spl.h | 1 |
5 files changed, 12 insertions, 3 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index f210ed8b92..3c53f0af10 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -73,6 +73,8 @@ #define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 +#define CONFIG_SUPPORT_EMMC_BOOT + /* USB xHCI HOST */ #define CONFIG_CMD_USB #define CONFIG_USB_HOST diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 76c5106b45..3df502eda0 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -37,6 +37,7 @@ #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART #define CONFIG_HSMMC2_8BIT +#define CONFIG_SUPPORT_EMMC_BOOT /* Required support for the TCA642X GPIO we have on the uEVM */ #define CONFIG_TCA642X diff --git a/include/dwmmc.h b/include/dwmmc.h index a02dd67c13..b64155851d 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -142,7 +142,7 @@ struct dwmci_host { void (*clksel)(struct dwmci_host *host); void (*board_init)(struct dwmci_host *host); - unsigned int (*get_mmc_clk)(int dev_index); + unsigned int (*get_mmc_clk)(struct dwmci_host *host); }; struct dwmci_idmac { diff --git a/include/mmc.h b/include/mmc.h index e1060b9ff2..e95a2376d2 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -187,6 +187,9 @@ #define EXT_CSD_BOOT_PART_NUM(x) (x << 3) #define EXT_CSD_PARTITION_ACCESS(x) (x << 0) +#define EXT_CSD_BOOT_BUS_WIDTH_MODE(x) (x << 3) +#define EXT_CSD_BOOT_BUS_WIDTH_RESET(x) (x << 2) +#define EXT_CSD_BOOT_BUS_WIDTH_WIDTH(x) (x) #define R1_ILLEGAL_COMMAND (1 << 22) #define R1_APP_CMD (1 << 5) @@ -310,8 +313,10 @@ int mmc_set_dsr(struct mmc *mmc, u16 val); /* Function to change the size of boot partition and rpmb partitions */ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, unsigned long rpmbsize); -/* Function to send commands to open/close the specified boot partition */ -int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access); +/* Function to modify the PARTITION_CONFIG field of EXT_CSD */ +int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access); +/* Function to modify the BOOT_BUS_WIDTH field of EXT_CSD */ +int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode); /** * Start device initialization and return immediately; it does not block on diff --git a/include/spl.h b/include/spl.h index 5e248561f1..dad00c0075 100644 --- a/include/spl.h +++ b/include/spl.h @@ -16,6 +16,7 @@ #define MMCSD_MODE_UNDEFINED 0 #define MMCSD_MODE_RAW 1 #define MMCSD_MODE_FAT 2 +#define MMCSD_MODE_EMMCBOOT 3 struct spl_image_info { const char *name; |
