diff options
| author | Tom Rini <[email protected]> | 2019-10-30 09:06:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-10-30 09:06:33 -0400 |
| commit | 700336f7e4452f58ebe074e4acfd15d57bb6be84 (patch) | |
| tree | da944f2c8f1c6aeaaf074dd7695782009b8f7e31 /common | |
| parent | ba742b839c524f7723799d750a540ad3fe70ca7f (diff) | |
| parent | a335f80502131e9e2b58a0281f5fc78018295ea4 (diff) | |
Merge tag 'mmc-10-29-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- fsl_esdhc driver cleanup
- spl_mmc bug fix to avoid access wrong emmc partition
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_mmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 34e1e73d80d..2ede096e61c 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -343,8 +343,6 @@ int spl_mmc_load(struct spl_image_info *spl_image, } } - raw_sect = spl_mmc_get_uboot_raw_sector(mmc); - boot_mode = spl_boot_mode(bootdev->boot_device); err = -EINVAL; switch (boot_mode) { @@ -383,6 +381,9 @@ int spl_mmc_load(struct spl_image_info *spl_image, if (!err) return err; } + + raw_sect = spl_mmc_get_uboot_raw_sector(mmc); + #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION err = mmc_load_image_raw_partition(spl_image, mmc, raw_part, raw_sect); |