Skip to contentSkip to conversation

Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

PATCH Superseded Ye Li 4 participants 5 messages Mar 31, 2020 – Apr 9, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Ye Li

author
#0 lore raw

PATCH 1/1 Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, it will append fdt to each loadable image.
Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended.

---
 common/spl/spl_fit.c | 4 ----
 1 file changed, 4 deletions(-)
common/spl/spl_fit.c +0 -4
index aef1dbd..69dabd2 100644
@@ -646,10 +646,6 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 
 		if (!spl_fit_image_get_os(fit, node, &os_type))
 			debug("Loadable is %s\n", genimg_get_os_name(os_type));
-#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
-		else
-			os_type = IH_OS_U_BOOT;
-#endif
 
 		if (os_type == IH_OS_U_BOOT) {
 			spl_fit_append_fdt(&image_info, info, sector,
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

Hi Ye Li,

Quoted 2 lines · Ye Li

The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct,

1. "Patch in commit" is not correct. Please refer it to "commit" instead.

2. Please use the same kernel style to refer to commit: 12 SHA digit and the subject between (" xxx ")

So this would become:

Commit cf8dcc5d02c3 ("common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled") is not correct...

Quoted 5 lines

it will append fdt to each loadable image.
Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended.

Tested on a imx6q and imx6qp sabresd:

Thanks

#2 lore raw

PATCH 1/1 Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

Quoted 20 lines · Fabio Estevam

Hi Ye Li,

Quoted 2 lines · Ye Li

The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct,

1. "Patch in commit" is not correct. Please refer it to "commit" instead.

2. Please use the same kernel style to refer to commit: 12 SHA digit and the subject between (" xxx ")

So this would become:

Commit cf8dcc5d02c3 ("common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled") is not correct...

Quoted 4 lines

it will append fdt to each loadable image.
Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended.

Quoted 5 lines
Quoted 1 line

Tested on a imx6q and imx6qp sabresd:

You should also mention that you're reverting the previous commit and I would really like Abel to confirm the problem they saw isn't reproducible. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200331/a535c48b/attachment.sig>
#3 lore raw

PATCH 1/1 Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

In reply to Ye Li
Quoted 6 lines · Ye Li

The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, it will append fdt to each loadable image.
Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended.

Hi,

I just rebased an i.mx8mm board from v2020.04-rc4 to v2020.04-rc5 that I'm preparing for submission upstream and noticed that this commit broke start of U-Boot. Reverting this or disabling FIT_IMAGE_TINY fixes it.

-Matt

Quoted 22 lines
---
 common/spl/spl_fit.c | 4 ----
 1 file changed, 4 deletions(-)
common/spl/spl_fit.c +0 -4
index aef1dbd..69dabd2 100644
@@ -646,10 +646,6 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 
 		if (!spl_fit_image_get_os(fit, node, &os_type))
 			debug("Loadable is %s\n", genimg_get_os_name(os_type));
-#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
-		else
-			os_type = IH_OS_U_BOOT;
-#endif
 
 		if (os_type == IH_OS_U_BOOT) {
 			spl_fit_append_fdt(&image_info, info, sector,
Signature · 1 line
2.7.4
author
#4 lore raw

Hi Matt,

Quoted 20 lines

-----Original Message-----
From: Matt Porter <[email protected]>
Sent: 2020?4?8? 5:38
To: Ye Li <[email protected]>
Cc: trini at konsulko.com; u-boot at lists.denx.de; Fabio Estevam <[email protected]>; Peng Fan <[email protected]>; Abel Vesa <[email protected]>; dl-uboot-imx <[email protected]>
Subject: [EXT] Re: [PATCH] Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

Caution: EXT Email

Quoted 6 lines · Ye Li

The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, it will append fdt to each loadable image. Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended.

Quoted 7 lines

Hi,

I just rebased an i.mx8mm board from v2020.04-rc4 to v2020.04-rc5 that I'm preparing for submission upstream and noticed that this commit broke start of U-Boot. Reverting this or disabling FIT_IMAGE_TINY fixes it.

-Matt

The mkimage_fit_atf.sh has a bug. It reverses the u-boot and atf: atf is set as firmware, but u-boot as loadable. So when the commit is reverted, fdt is appended to atf only. Previously fdt was appended to both. I will send a patch to fix the bug.

Best regards,
Ye Li

Quoted 25 lines
Quoted 14 lines
---
 common/spl/spl_fit.c | 4 ----
 1 file changed, 4 deletions(-)
common/spl/spl_fit.c index renamed from common/spl/spl_fit.c +0 -0

aef1dbd..69dabd2 100644

common/spl/spl_fit.c +0 -0
@@ -646,10 +646,6 @@ int spl_load_simple_fit(struct spl_image_info
 *spl_image,
 
              if (!spl_fit_image_get_os(fit, node, &os_type))
                      debug("Loadable is %s\n",
Quoted 1 line

genimg_get_os_name(os_type)); -#if

CONFIG_IS_ENABLED(FIT_IMAGE_TINY)

Quoted 9 lines
common/spl/spl_fit.c +0 -4
-             else
-                     os_type = IH_OS_U_BOOT;
-#endif
 
              if (os_type == IH_OS_U_BOOT) {
                      spl_fit_append_fdt(&image_info, info, sector,
--

2.7.4