From 5b6fc3bc15c41cf8a36593be00380e76f0aa3fd7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 7 Feb 2018 12:41:43 +0000 Subject: [PATCH] Update uEFI patches --- uboot-tools.spec | 9 ++++++--- ...d-FDT-from-any-partition-on-boot-device.patch | 8 ++++---- uefi-use-Fedora-specific-path-name.patch | 16 ++++++++-------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index a0dc5d4..9dc2b5d 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2018.03 -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 @@ -15,10 +15,10 @@ Source4: aarch64-chromebooks Source5: 10-devicetree.install # Fedoraisms patches -#Patch1: uefi-use-Fedora-specific-path-name.patch +Patch1: uefi-use-Fedora-specific-path-name.patch # general fixes -#Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch +Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch Patch3: usb-kbd-fixes.patch # Board fixes and enablement @@ -287,6 +287,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Wed Feb 7 2018 Peter Robinson 2018.03-0.2.rc1 +- Update uEFI patches + * Tue Jan 30 2018 Peter Robinson 2018.03-0.1.rc1 - 2018.03 RC1 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 454b060..a2340fd 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,7 +1,7 @@ -From 3ab824aea2ad90cd980986a32c4523fcce778a03 Mon Sep 17 00:00:00 2001 +From 8bc6f62541436ebaf87133792726d9b48f878d09 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 5 Dec 2017 00:11:08 +0000 -Subject: [PATCH 2/5] distro: load FDT from any partition on boot device +Subject: [PATCH] distro: load FDT from any partition on boot device In the EFI_LOADER boot path, we were only checking the FAT partition containing the EFI payload for dtb files. But this is somewhat of a @@ -26,10 +26,10 @@ Signed-off-by: Peter Robinson 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index c2822b4d06..b91f2eabe3 100644 +index 7746366ec8..c87f7c2a42 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h -@@ -130,25 +130,37 @@ +@@ -135,25 +135,37 @@ "fi\0" \ \ "load_efi_dtb=" \ diff --git a/uefi-use-Fedora-specific-path-name.patch b/uefi-use-Fedora-specific-path-name.patch index b566f3c..7f61250 100644 --- a/uefi-use-Fedora-specific-path-name.patch +++ b/uefi-use-Fedora-specific-path-name.patch @@ -1,7 +1,7 @@ -From 74a8239f40092900d83dd5c9632b5652b242e158 Mon Sep 17 00:00:00 2001 +From 2b411f6edf298899098e2077a5ca2dfdaf3d882f Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 5 Dec 2017 00:10:22 +0000 -Subject: [PATCH 1/5] use Fedora specific EFI path/name +Date: Wed, 7 Feb 2018 12:37:58 +0000 +Subject: [PATCH] use Fedora specific EFI path/name Signed-off-by: Peter Robinson --- @@ -9,10 +9,10 @@ Signed-off-by: Peter Robinson 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 5c469a23fa..c2822b4d06 100644 +index f567cebd38..7746366ec8 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h -@@ -88,7 +88,7 @@ +@@ -93,7 +93,7 @@ #ifdef CONFIG_EFI_LOADER #if defined(CONFIG_ARM64) @@ -21,7 +21,7 @@ index 5c469a23fa..c2822b4d06 100644 #elif defined(CONFIG_ARM) #define BOOTEFI_NAME "bootarm.efi" #elif defined(CONFIG_X86_RUN_32BIT) -@@ -122,7 +122,7 @@ +@@ -127,7 +127,7 @@ "bootefi bootmgr ${fdtcontroladdr};" \ "fi;" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ @@ -29,8 +29,8 @@ index 5c469a23fa..c2822b4d06 100644 + "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \ "if fdt addr ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ - "else " \ -@@ -145,9 +145,9 @@ + "else " \ +@@ -150,9 +150,9 @@ "fi;" \ "done;" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \