From d931feb6b329a78be17bca528a6f75cdc2f86821 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 26 Oct 2020 09:32:10 +0000 Subject: [PATCH] arm/edk2-firmware: don't assume that platforms are in edk2-platforms Some platforms are inside edk2 itself, so don't assume that the platform path is relative to edk2-platforms. Remove the edk2-platforms path prefix from the tasks, and move the prefix to EDK2_PLATFORM_DSC. Change-Id: I53e3dcd499f4d9f1d72c4d68ac82faed4fec70f2 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 2 +- meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc index 94f9beb0..3c57bd02 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc @@ -10,7 +10,7 @@ SRCREV_edk2-platforms = "d9d32e6c8b7456d21ce365486ac563b6be36c20d" # N1SDP specific EDK2 configurations EDK2_BUILD_RELEASE = "0" EDK2_PLATFORM = "n1sdp" -EDK2_PLATFORM_DSC = "N1SdpPkg/N1SdpPlatform.dsc" +EDK2_PLATFORM_DSC = "Platform/ARM/N1SdpPkg/N1SdpPlatform.dsc" EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_ARCH = "AARCH64" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc index 0e30a712..9666a1ee 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc @@ -4,7 +4,7 @@ SRCREV_edk2-platforms = "b972f17b329a85e6aa4d69f240d459839ba8b47c" # SGI575 specific EDK2 configurations EDK2_BUILD_RELEASE = "0" EDK2_PLATFORM = "Sgi575" -EDK2_PLATFORM_DSC = "SgiPkg/Sgi575/Sgi575.dsc" +EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc" EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_ARCH = "AARCH64" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb index 93c40e8f..07303d0c 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb @@ -77,7 +77,7 @@ do_compile() { -a "${EDK2_ARCH}" \ -b ${EDK2_BUILD_MODE} \ -t ${EDK_COMPILER} \ - -p "${S}/edk2-platforms/Platform/ARM/${EDK2_PLATFORM_DSC}" + -p ${EDK2_PLATFORM_DSC} } do_install() {