diff options
| author | Tom Rini <[email protected]> | 2023-10-27 09:38:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-27 09:38:58 -0400 |
| commit | 753eba3f68d87b90a99136eba6403a7e3640e707 (patch) | |
| tree | 669b791a21bee03e61afd948728aac81c56fc510 /cmd | |
| parent | fb428b61819444b9337075f49c72f326f5d12085 (diff) | |
| parent | b6014f209f15bd49dd4ceb987d3a52e99b0305d4 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kirkwood: Enable bootstd on some boards (Tony)
- mvebu: turris_mox: Extend to support RIPE Atlas Probe (Marek)
- mvebu/bubt: Support eMMC data partition booting (Josua)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mvebu/bubt.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index ca24a5c1c4b..744b1c20aa8 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -240,9 +240,16 @@ static int mmc_burn_image(size_t image_size) #endif /* SD reserves LBA-0 for MBR and boots from LBA-1, - * MMC/eMMC boots from LBA-0 + * MMC/eMMC boots from LBA-0 and LBA-4096 */ - start_lba = IS_SD(mmc) ? 1 : 0; + if (IS_SD(mmc)) + start_lba = 1; +#ifdef CONFIG_SUPPORT_EMMC_BOOT + else if (part) + start_lba = 0; +#endif + else + start_lba = 4096; #ifdef CONFIG_BLK blk_count = image_size / mmc->write_bl_len; if (image_size % mmc->write_bl_len) |