mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-21 06:31:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: mvebu: spl: Load proper U-Boot from selected eMMC boot partition

Browse Source 
When eMMC boot is selected then BootROM loads kwbimage header (U-Boot SPL)
from the selected eMMC boot partition. So for eMMC boot ensure that U-Boot
SPL loads U-Boot proper (from kwbimage) also from the same selected eMMC
boot partition.

Fixes: 2226ca173486 ("arm: mvebu: Load U-Boot proper binary in SPL code based on kwbimage header")
Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Pali Rohár 2023-01-08 13:31:41 +01:00 committed by Stefan Roese
parent 8b49e63e09
commit 2f27db2fbd
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mvebu/Kconfig
View File

@ -348,6 +348,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
imply SPL_GPIO imply SPL_GPIO
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_MMC imply SPL_MMC
select SUPPORT_EMMC_BOOT if SPL_MMC
select SPL_BOOTROM_SUPPORT select SPL_BOOTROM_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_SATA config MVEBU_SPL_BOOT_DEVICE_SATA

8
arch/arm/mach-mvebu/spl.c
View File

@ -41,6 +41,12 @@
* kwbimage main header. * kwbimage main header.
*/ */
#ifdef CONFIG_SPL_MMC #ifdef CONFIG_SPL_MMC
#ifdef CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG
#error CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG is unsupported
#endif
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION
#error CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION is unsupported
#endif
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
#error CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is unsupported #error CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is unsupported
#endif #endif
@ -98,7 +104,7 @@ struct kwbimage_main_hdr_v1 {
#ifdef CONFIG_SPL_MMC #ifdef CONFIG_SPL_MMC
u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
{ {
return MMCSD_MODE_RAW; return MMCSD_MODE_EMMCBOOT;
} }
#endif #endif