Use the new versioning scheme, match edk2 recipe change. The hyperlink in the license file for STM points to STM-SLA0044-Rev5 license.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-bsp/board-firmware/board-firmware-image.bb | 4 ++-- .../{board-firmware_1.4.bb => board-firmware_morello-1.4.bb} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta-morello/recipes-bsp/board-firmware/{board-firmware_1.4.bb => board-firmware_morello-1.4.bb} (93%)
diff --git a/meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb index 2ab5e5f..7a09568 100644 --- a/meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb +++ b/meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb @@ -18,7 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" BB_DONT_CACHE = "1"
DEPENDS += "virtual/board-firmware virtual/scp-firmware \ - virtual/trusted-firmware-a virtual/uefi virtual/grub-efi \ + virtual/trusted-firmware-a virtual/edk2-firmware grub-efi \ mtools-native fiptool-native"
PROVIDES = "virtual/board-firmware-image" @@ -47,7 +47,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[depends] += "virtual/board-firmware:do_populate_sysroot" do_install[depends] += "virtual/scp-firmware:do_populate_sysroot" -do_install[depends] += "virtual/uefi:do_populate_sysroot" +do_install[depends] += "virtual/edk2-firmware:do_populate_sysroot" do_install[depends] += "virtual/trusted-firmware-a:do_populate_sysroot"
do_install:prepend() { diff --git a/meta-morello/recipes-bsp/board-firmware/board-firmware_1.4.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.4.bb similarity index 93% rename from meta-morello/recipes-bsp/board-firmware/board-firmware_1.4.bb rename to meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.4.bb index 9d98dc2..7e29ac1 100644 --- a/meta-morello/recipes-bsp/board-firmware/board-firmware_1.4.bb +++ b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.4.bb @@ -2,7 +2,7 @@ COMPATIBLE_MACHINE = "morello" SUMMARY = "Board firmware for Morello" DESCRIPTION = "The SD card image from ARM that contains non compile-able binaries." HOMEPAGE = "https://git.morello-project.org/morello/board-firmware" -LICENSE = "STMicroelectronics & BSD-3-Clause & BSD-2-Clause" +LICENSE = "STM-SLA0044-Rev5 & BSD-3-Clause & BSD-2-Clause" OUTPUTS_NAME = "board-firmware" SECTION = "firmware"