Skip to contentSkip to conversation

omap34xx: SPL: enable MMC raw boot with u-boot.img

PATCH New Denis 'GNUtoo' Carikli 2 participants 3 messages Nov 10, 2019 – Jan 20, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap34xx: SPL: enable MMC raw boot with u-boot.img

The following commit enabled raw SPL booting:
22d90d560a omap3: Use raw SPL by default for mmc1
but it was reverted by the following commit:
821c89d38c Revert "omap3: Use raw SPL by default for mmc1"
because SPL is unable to distinguish between RAW images and garbage.

However if CONFIG_SPL_RAW_IMAGE_SUPPORT is disabled, SPL does identify if there is a valid image with spl_parse_image_header.

With this change, and CONFIG_SPL_RAW_IMAGE_SUPPORT disabled, raw MMC boot will be tried first, and if it fails, it FS will be tried.

The two scenarios have been tested on a BeagleBoard XM Revision C1.

---
 arch/arm/mach-omap2/boot-common.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-omap2/boot-common.c +2 -0
index 734fa9d9e6..a48244e1c5 100644
@@ -132,8 +132,10 @@ void save_omap_boot_params(void)
 	    (boot_device <= MMC_BOOT_DEVICES_END)) {
 		switch (boot_device) {
 		case BOOT_DEVICE_MMC1:
+#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
 			boot_mode = MMCSD_MODE_FS;
 			break;
+#endif
 		case BOOT_DEVICE_MMC2:
 			boot_mode = MMCSD_MODE_RAW;
 			break;
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 omap34xx: SPL: enable MMC raw boot with u-boot.img

Quoted 26 lines · On Sun, 10 Nov 2019 01:48:17 +0100 Denis 'GNUtoo' Carikli…

The following commit enabled raw SPL booting:
22d90d560a omap3: Use raw SPL by default for mmc1
but it was reverted by the following commit:
821c89d38c Revert "omap3: Use raw SPL by default for mmc1"
because SPL is unable to distinguish between RAW images and garbage.

However if CONFIG_SPL_RAW_IMAGE_SUPPORT is disabled, SPL does identify if there is a valid image with spl_parse_image_header.

With this change, and CONFIG_SPL_RAW_IMAGE_SUPPORT disabled, raw MMC boot will be tried first, and if it fails, it FS will be tried.

The two scenarios have been tested on a BeagleBoard XM Revision C1.

---
 arch/arm/mach-omap2/boot-common.c | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/boot-common.c index 734fa9d9e6..a48244e1c5 100644 --- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c

arch/arm/mach-omap2/boot-common.c void save_omap_boot_params(void) · line 141

Quoted 10 lines
arch/arm/mach-omap2/boot-common.c +2 -0
@@ -132,8 +132,10 @@ void save_omap_boot_params(void)
 	    (boot_device <= MMC_BOOT_DEVICES_END)) {
 		switch (boot_device) {
 		case BOOT_DEVICE_MMC1:
+#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
 			boot_mode = MMCSD_MODE_FS;
 			break;
+#endif
 		case BOOT_DEVICE_MMC2:
 			boot_mode = MMCSD_MODE_RAW;
 			break;

Ping.

Denis.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200107/85c77086/attachment.sig>

#2 lore raw

PATCH 1/1 omap34xx: SPL: enable MMC raw boot with u-boot.img

In reply to Denis 'GNUtoo' Carikli
Quoted 7 lines · Denis 'GNUtoo' Carikli

The following commit enabled raw SPL booting:
22d90d560a omap3: Use raw SPL by default for mmc1
but it was reverted by the following commit:
821c89d38c Revert "omap3: Use raw SPL by default for mmc1"
because SPL is unable to distinguish between RAW images and garbage.

Quoted 6 lines

However if CONFIG_SPL_RAW_IMAGE_SUPPORT is disabled, SPL does identify if there is a valid image with spl_parse_image_header.

With this change, and CONFIG_SPL_RAW_IMAGE_SUPPORT disabled, raw MMC boot will be tried first, and if it fails, it FS will be tried.

This means that if FS boot is required then SPL_RAW_IMAGE_SUPPORT should be disabled. So with this patch applied, the default omap3_defconfig will fail to boot with FS mode. It is difficult to support this unless ROM passes some information on the bootmode.

Thanks and regards,
Lokesh

Quoted 24 lines

The two scenarios have been tested on a BeagleBoard XM Revision C1.

---
 arch/arm/mach-omap2/boot-common.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-omap2/boot-common.c +2 -0
index 734fa9d9e6..a48244e1c5 100644
@@ -132,8 +132,10 @@ void save_omap_boot_params(void)
 	    (boot_device <= MMC_BOOT_DEVICES_END)) {
 		switch (boot_device) {
 		case BOOT_DEVICE_MMC1:
+#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
 			boot_mode = MMCSD_MODE_FS;
 			break;
+#endif
 		case BOOT_DEVICE_MMC2:
 			boot_mode = MMCSD_MODE_RAW;
 			break;