summaryrefslogtreecommitdiff
path: root/drivers/mmc/mmc_boot.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-08-18 18:24:36 -0400
committerTom Rini <trini@konsulko.com>2017-08-18 18:24:36 -0400
commit1fdafb2e3dfecdc4129a8062ad25b1adb32b0efb (patch)
tree6c6a74d4cb4e8a19bfd47510ade9fdcc3d08cb01 /drivers/mmc/mmc_boot.c
parenta6dd10c70be9be863488d9d7afede057a4d99823 (diff)
parenta191ccaf12fb4fadedcd3c76df6327e2bb0f182b (diff)
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/mmc_boot.c')
-rw-r--r--drivers/mmc/mmc_boot.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/mmc/mmc_boot.c b/drivers/mmc/mmc_boot.c
index ac6f56f157a..6d77ce95e7e 100644
--- a/drivers/mmc/mmc_boot.c
+++ b/drivers/mmc/mmc_boot.c
@@ -100,10 +100,19 @@ int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode)
*/
int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
{
- return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
- EXT_CSD_BOOT_ACK(ack) |
- EXT_CSD_BOOT_PART_NUM(part_num) |
- EXT_CSD_PARTITION_ACCESS(access));
+ int ret;
+ u8 part_conf;
+
+ part_conf = EXT_CSD_BOOT_ACK(ack) |
+ EXT_CSD_BOOT_PART_NUM(part_num) |
+ EXT_CSD_PARTITION_ACCESS(access);
+
+ ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
+ part_conf);
+ if (!ret)
+ mmc->part_config = part_conf;
+
+ return ret;
}
/*