leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: allow boot from first bootable partition

Browse Source 
This was implemented in order to get dual-slot bootloader
partitions on the BeagleBone Black, whose MLO boots from
the first bootable partition: MLO chainloads u-boot in the
same way.

Signed-off-by: Jérôme Carretero <cJ-uboot@zougloub.eu>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Jérôme Carretero 2022-03-15 16:34:51 -04:00 committed by Tom Rini
parent e146a2c12f
commit 5fa973eb28
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/spl/Kconfig
View File

@ -668,7 +668,8 @@ config SYS_MMCSD_FS_BOOT_PARTITION
default 1 default 1
help help
Partition on the MMC to load U-Boot from when the MMC is being Partition on the MMC to load U-Boot from when the MMC is being
used in fs mode used in fs mode.
Use -1 as a special value to use the first bootable partition.
config SPL_MMC_TINY config SPL_MMC_TINY
bool "Tiny MMC framework in SPL" bool "Tiny MMC framework in SPL"

32
common/spl/spl_mmc.c
View File

@ -280,16 +280,40 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image,
{ {
int err = -ENOSYS; int err = -ENOSYS;
__maybe_unused int partition = CONFIG_SYS_MMCSD_FS_BOOT_PARTITION;
#if CONFIG_SYS_MMCSD_FS_BOOT_PARTITION == -1
{
struct disk_partition info;
debug("Checking for the first MBR bootable partition\n");
for (int type_part = 1; type_part <= DOS_ENTRY_NUMBERS; type_part++) {
err = part_get_info(mmc_get_blk_desc(mmc), type_part, &info);
if (err)
continue;
debug("Partition %d is of type %d and bootable=%d\n", type_part, info.sys_ind, info.bootable);
if (info.bootable != 0) {
debug("Partition %d is bootable, using it\n", type_part);
partition = type_part;
break;
}
}
printf("Using first bootable partition: %d\n", partition);
if (partition == CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) {
return -ENOSYS;
}
}
#endif
#ifdef CONFIG_SPL_FS_FAT #ifdef CONFIG_SPL_FS_FAT
if (!spl_start_uboot()) { if (!spl_start_uboot()) {
err = spl_load_image_fat_os(spl_image, bootdev, mmc_get_blk_desc(mmc), err = spl_load_image_fat_os(spl_image, bootdev, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION); partition);
if (!err) if (!err)
return err; return err;
} }
#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
err = spl_load_image_fat(spl_image, bootdev, mmc_get_blk_desc(mmc), err = spl_load_image_fat(spl_image, bootdev, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION, partition,
filename); filename);
if (!err) if (!err)
return err; return err;
@ -298,13 +322,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_FS_EXT4 #ifdef CONFIG_SPL_FS_EXT4
if (!spl_start_uboot()) { if (!spl_start_uboot()) {
err = spl_load_image_ext_os(spl_image, bootdev, mmc_get_blk_desc(mmc), err = spl_load_image_ext_os(spl_image, bootdev, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION); partition);
if (!err) if (!err)
return err; return err;
} }
#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
err = spl_load_image_ext(spl_image, bootdev, mmc_get_blk_desc(mmc), err = spl_load_image_ext(spl_image, bootdev, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION, partition,
filename); filename);
if (!err) if (!err)
return err; return err;