Skip to contentSkip to conversation

Revert "x86: bootm: Fix FIT image booting on x86"

PATCH New Anatolij Gustschin 3 participants 4 messages Nov 23, 2017 – Nov 24, 2017 x86

lore
Share & tools
lore

Anatolij Gustschin

author
#0 lore raw

PATCH 1/1 Revert "x86: bootm: Fix FIT image booting on x86"

This reverts commit 13c531e52a09b4e6ffa8b5a1457199b0a574cb27.

The error message with FIT style image mentioned in the above commit only happens when booting using FIT image containing bzImage kernel and without setup node (setup.bin). The current documentation for x86 FIT support in doc/uImage.FIT/x86-fit-boot.txt mentions that kernel's setup.bin file is required for building x86 FIT images. The above commit breaks FIT images generated as described in the documentation. Revert it to allow booting with images built in the documented way.

Signed-off-by Anatolij Gustschin <[email protected]>
---
 arch/x86/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/bootm.c +1 -1
index ecd4f4e6c6..e548cdbed5 100644
@@ -109,7 +109,7 @@ static int boot_prep_linux(bootm_headers_t *images)
 		}
 		is_zimage = 1;
 #if defined(CONFIG_FIT)
-	} else if (images->fit_uname_os) {
+	} else if (images->fit_uname_os && is_zimage) {
 		ret = fit_image_get_data(images->fit_hdr_os,
 				images->fit_noffset_os,
 				(const void **)&data, &len);
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 Revert "x86: bootm: Fix FIT image booting on x86"

Quoted 22 lines · Anatolij Gustschin

This reverts commit 13c531e52a09b4e6ffa8b5a1457199b0a574cb27.

The error message with FIT style image mentioned in the above commit only happens when booting using FIT image containing bzImage kernel and without setup node (setup.bin). The current documentation for x86 FIT support in doc/uImage.FIT/x86-fit-boot.txt mentions that kernel's setup.bin file is required for building x86 FIT images. The above commit breaks FIT images generated as described in the documentation. Revert it to allow booting with images built in the documented way.

Signed-off-by Anatolij Gustschin <[email protected]>
---
  arch/x86/lib/bootm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/bootm.c +0 -0
index ecd4f4e6c6..e548cdbed5 100644

arch/x86/lib/bootm.c static int boot_prep_linux(bootm_headers_t *images) · line 115

Quoted 8 lines
arch/x86/lib/bootm.c +1 -1
@@ -109,7 +109,7 @@ static int boot_prep_linux(bootm_headers_t *images)
  		}
  		is_zimage = 1;
  #if defined(CONFIG_FIT)
-	} else if (images->fit_uname_os) {
+	} else if (images->fit_uname_os && is_zimage) {
  		ret = fit_image_get_data(images->fit_hdr_os,
  				images->fit_noffset_os,
  				(const void **)&data, &len);
Reviewed-by Stefan Roese <[email protected]>

Thanks,
Stefan

#2 lore raw

PATCH 1/1 Revert "x86: bootm: Fix FIT image booting on x86"

In reply to Anatolij Gustschin
Quoted 11 lines · Anatolij Gustschin

This reverts commit 13c531e52a09b4e6ffa8b5a1457199b0a574cb27.

The error message with FIT style image mentioned in the above commit only happens when booting using FIT image containing bzImage kernel and without setup node (setup.bin). The current documentation for x86 FIT support in doc/uImage.FIT/x86-fit-boot.txt mentions that kernel's setup.bin file is required for building x86 FIT images. The above commit breaks FIT images generated as described in the documentation. Revert it to allow booting with images built in the documented way.

Quoted 5 lines
Signed-off-by Anatolij Gustschin <[email protected]>
---
 arch/x86/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by Bin Meng <[email protected]>
#3 lore raw

PATCH 1/1 Revert "x86: bootm: Fix FIT image booting on x86"

Quoted 12 lines · Bin Meng
Quoted 11 lines · Anatolij Gustschin

This reverts commit 13c531e52a09b4e6ffa8b5a1457199b0a574cb27.

The error message with FIT style image mentioned in the above commit only happens when booting using FIT image containing bzImage kernel and without setup node (setup.bin). The current documentation for x86 FIT support in doc/uImage.FIT/x86-fit-boot.txt mentions that kernel's setup.bin file is required for building x86 FIT images. The above commit breaks FIT images generated as described in the documentation. Revert it to allow booting with images built in the documented way.

Quoted 7 lines
Quoted 5 lines
Signed-off-by Anatolij Gustschin <[email protected]>
---
 arch/x86/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by Bin Meng <[email protected]>

applied to u-boot-x86, thanks!