From 5fa2e9250cf9cdb39168a205a106ace7f6e59edd Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 14 Dec 2020 09:41:34 +0100 Subject: [PATCH] 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 --- uboot-tools.spec | 5 ++++- ...load-FDT-from-any-partition-on-boot-device.patch | 13 +++++++------ uefi-use-Fedora-specific-path-name.patch | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index 39a089a..31a75ec 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2021.01 -Release: 0.1%{?candidate:.%{candidate}}%{?dist} +Release: 0.2%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -239,6 +239,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Dec 14 2020 Javier Martinez Canillas - 2021.01-0.2.rc2 +- Fix a "scan_dev_for_efi" not defined error + * Sun Nov 22 2020 Peter Robinson - 2021.01-0.1.rc2 - Update to 2021.01 RC2 - Latest Pinebook Pro display patches diff --git a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch index 9d70978..cc2c4f8 100644 --- a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch +++ b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch @@ -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 Date: Tue, 24 Nov 2020 10:35:48 +0000 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 Signed-off-by: Peter Robinson --- - include/config_distro_bootcmd.h | 31 ++++++++++++++++++++++--------- - 1 file changed, 22 insertions(+), 9 deletions(-) + include/config_distro_bootcmd.h | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) 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 +++ b/include/config_distro_bootcmd.h @@ -142,24 +142,37 @@ @@ -49,6 +49,7 @@ index ff29ef5a90..e6a5267159 100644 - "run load_efi_dtb; " \ - "fi;" \ - "done;" \ +- "run boot_efi_bootmgr;" \ + "part list ${devtype} ${devnum} dtb_devplist; " \ + "env exists dtb_devplist || setenv dtb_devplist " \ + "${distro_bootpart}; " \ @@ -65,7 +66,7 @@ index ff29ef5a90..e6a5267159 100644 + "fi;" \ + "done; " \ + "done; " \ - "run boot_efi_bootmgr;" \ ++ "run boot_efi_bootmgr\0" \ + "scan_dev_for_efi=" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "efi/boot/"BOOTEFI_NAME"; then " \ @@ -77,5 +78,5 @@ index ff29ef5a90..e6a5267159 100644 "fi; " \ "setenv efi_fdtfile\0" -- -2.28.0 +2.29.2 diff --git a/uefi-use-Fedora-specific-path-name.patch b/uefi-use-Fedora-specific-path-name.patch index 6eb691e..a7f6a16 100644 --- a/uefi-use-Fedora-specific-path-name.patch +++ b/uefi-use-Fedora-specific-path-name.patch @@ -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 Date: Tue, 24 Nov 2020 10:37:28 +0000 Subject: [PATCH 2/2] use Fedora specific EFI path/name @@ -9,7 +9,7 @@ Signed-off-by: Peter Robinson 1 file changed, 5 insertions(+), 5 deletions(-) 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 +++ b/include/config_distro_bootcmd.h @@ -92,9 +92,9 @@ @@ -34,7 +34,7 @@ index e6a5267159..f8c4f58907 100644 "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "else " \ @@ -169,9 +169,9 @@ - "run boot_efi_bootmgr;" \ + "run boot_efi_bootmgr\0" \ "scan_dev_for_efi=" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ - "efi/boot/"BOOTEFI_NAME"; then " \ @@ -46,5 +46,5 @@ index e6a5267159..f8c4f58907 100644 "echo EFI LOAD FAILED: continuing...; " \ "fi; " \ -- -2.28.0 +2.29.2