diff mbox series

arm/edk2-firmware: devtool changes

Message ID 20220629130142.20544-1-jon.mason@arm.com
State New
Headers show
Series arm/edk2-firmware: devtool changes | expand

Commit Message

Jon Mason June 29, 2022, 1:01 p.m. UTC 
Make the changes necessary to allow for devtool to be used on edk2
sources.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc   | 2 +-
 meta-arm/recipes-bsp/uefi/files/default.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jon Mason June 30, 2022, 2:01 p.m. UTC | #1 
On Wed, 29 Jun 2022 09:01:42 -0400, Jon Mason wrote:
> Make the changes necessary to allow for devtool to be used on edk2
> sources.

Applied, thanks!

[1/1] arm/edk2-firmware: devtool changes
      commit: cab723f0154c8fa7a1ae8719653565370fe5cd03

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index 21bc58dd..76f9d62c 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -18,7 +18,7 @@  SRC_URI = "\
     ${EDK2_SRC_URI};name=edk2;destsuffix=edk2;nobranch=1 \
     ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms;nobranch=1 \
     file://unaligned.patch \
-    file://default.patch \
+    file://default.patch;patchdir=edk2-platforms \
 "
 
 SRCREV_FORMAT         = "edk2_edk2-platforms"
diff --git a/meta-arm/recipes-bsp/uefi/files/default.patch b/meta-arm/recipes-bsp/uefi/files/default.patch
index 7c2ffc2b..fca232f0 100644
--- a/meta-arm/recipes-bsp/uefi/files/default.patch
+++ b/meta-arm/recipes-bsp/uefi/files/default.patch
@@ -16,8 +16,8 @@  Signed-off-by: Ross Burton <ross.burton@arm.com>
 
 diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
 index d23739ad38..fba5e0ba30 100644
---- a/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-+++ b/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
+--- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
++++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
 @@ -136,1 +136,1 @@ ShellDynCmdRunAxfHandler (
 -  UINTN                       FileSize;
 +  UINTN                       FileSize = 0;