rpms
/
uboot-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a "scan_dev_for_efi" not defined error 

A previous commit dropped a NUL character at the end of scan_dev_for_dtb
definition and this caused scan_dev_for_efi to not be defined. Following
error is shown by U-Boot when trying to boot an EFI binary:

 Scanning mmc 0:2...
 ## Error: "scan_dev_for_efi" not defined
This commit is contained in:
Javier Martinez Canillas 2020-12-14 09:41:34 +01:00
parent 6623ecd526
commit 5fa2e9250c
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
uboot-tools.spec
View File

@ -2,7 +2,7 @@
Name: uboot-tools Name: uboot-tools
Version: 2021.01 Version: 2021.01
Release: 0.1%{?candidate:.%{candidate}}%{?dist} Release: 0.2%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot URL: http://www.denx.de/wiki/U-Boot
@ -239,6 +239,9 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif %endif
%changelog %changelog
* Mon Dec 14 2020 Javier Martinez Canillas <javierm@redhat.com> - 2021.01-0.2.rc2
- Fix a "scan_dev_for_efi" not defined error
* Sun Nov 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.1.rc2 * Sun Nov 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.1.rc2
- Update to 2021.01 RC2 - Update to 2021.01 RC2
- Latest Pinebook Pro display patches - Latest Pinebook Pro display patches

13
uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
View File

@ -1,4 +1,4 @@
From 7f91e98f42f620684fc5a1e918e24cfb838a12c5 Mon Sep 17 00:00:00 2001 From cc3700b5c65494547308df395fe63166ff48a1e3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 24 Nov 2020 10:35:48 +0000 Date: Tue, 24 Nov 2020 10:35:48 +0000
Subject: [PATCH 1/2] distro: load FDT from any partition on boot device Subject: [PATCH 1/2] distro: load FDT from any partition on boot device
@ -22,11 +22,11 @@ knows) and SoC/board specific ${fdtfile} (which grub does not know).
Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
--- ---
include/config_distro_bootcmd.h | 31 ++++++++++++++++++++++--------- include/config_distro_bootcmd.h | 33 +++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 9 deletions(-) 1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index ff29ef5a90..e6a5267159 100644 index ff29ef5a905..769477cd80e 100644
--- a/include/config_distro_bootcmd.h --- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h
@@ -142,24 +142,37 @@ @@ -142,24 +142,37 @@
@ -49,6 +49,7 @@ index ff29ef5a90..e6a5267159 100644
- "run load_efi_dtb; " \ - "run load_efi_dtb; " \
- "fi;" \ - "fi;" \
- "done;" \ - "done;" \
- "run boot_efi_bootmgr;" \
+ "part list ${devtype} ${devnum} dtb_devplist; " \ + "part list ${devtype} ${devnum} dtb_devplist; " \
+ "env exists dtb_devplist || setenv dtb_devplist " \ + "env exists dtb_devplist || setenv dtb_devplist " \
+ "${distro_bootpart}; " \ + "${distro_bootpart}; " \
@ -65,7 +66,7 @@ index ff29ef5a90..e6a5267159 100644
+ "fi;" \ + "fi;" \
+ "done; " \ + "done; " \
+ "done; " \ + "done; " \
"run boot_efi_bootmgr;" \ + "run boot_efi_bootmgr\0" \
+ "scan_dev_for_efi=" \ + "scan_dev_for_efi=" \
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \
"efi/boot/"BOOTEFI_NAME"; then " \ "efi/boot/"BOOTEFI_NAME"; then " \
@ -77,5 +78,5 @@ index ff29ef5a90..e6a5267159 100644
"fi; " \ "fi; " \
"setenv efi_fdtfile\0" "setenv efi_fdtfile\0"
-- --
2.28.0 2.29.2

8
uefi-use-Fedora-specific-path-name.patch
View File

@ -1,4 +1,4 @@
From 26b8c1e30342515e252ebf779c79b7bbe1d91747 Mon Sep 17 00:00:00 2001 From d8fcb72d566b0ebca1613555ac13c0798817487e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 24 Nov 2020 10:37:28 +0000 Date: Tue, 24 Nov 2020 10:37:28 +0000
Subject: [PATCH 2/2] use Fedora specific EFI path/name Subject: [PATCH 2/2] use Fedora specific EFI path/name
@ -9,7 +9,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index e6a5267159..f8c4f58907 100644 index 769477cd80e..22ce3685758 100644
--- a/include/config_distro_bootcmd.h --- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h
@@ -92,9 +92,9 @@ @@ -92,9 +92,9 @@
@ -34,7 +34,7 @@ index e6a5267159..f8c4f58907 100644
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \
"else " \ "else " \
@@ -169,9 +169,9 @@ @@ -169,9 +169,9 @@
"run boot_efi_bootmgr;" \ "run boot_efi_bootmgr\0" \
"scan_dev_for_efi=" \ "scan_dev_for_efi=" \
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \
- "efi/boot/"BOOTEFI_NAME"; then " \ - "efi/boot/"BOOTEFI_NAME"; then " \
@ -46,5 +46,5 @@ index e6a5267159..f8c4f58907 100644
"echo EFI LOAD FAILED: continuing...; " \ "echo EFI LOAD FAILED: continuing...; " \
"fi; " \ "fi; " \
-- --
2.28.0 2.29.2