From: Jan Kiszka <[email protected]> Use the trusted-firmware-a-custom.inc to model the rpi4 build. This comes with a package renaming.
It also gives the chance to update to release 2.3 which allows to drop patches. They will be removed from the tree later on, when the last user of the old arm-trusted-firmware recipes is converted. Signed-off-by: Jan Kiszka <[email protected]> --- conf/machine/rpi4.conf | 4 +-- .../arm-trusted-firmware-rpi4_2.2.bb | 28 ------------------- .../arm-trusted-firmware/files/rpi-rules | 23 --------------- .../trusted-firmware-a-rpi4_2.3.bb | 14 ++++++++++ .../trusted-firmware-a_2.3.inc | 17 +++++++++++ 5 files changed, 33 insertions(+), 53 deletions(-) delete mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware-rpi4_2.2.bb delete mode 100644 recipes-bsp/arm-trusted-firmware/files/rpi-rules create mode 100644 recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb create mode 100644 recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc diff --git a/conf/machine/rpi4.conf b/conf/machine/rpi4.conf index 8ccef6b..b26effa 100644 --- a/conf/machine/rpi4.conf +++ b/conf/machine/rpi4.conf @@ -12,7 +12,7 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE = "wic-img" -IMAGER_BUILD_DEPS = "rpi-firmware arm-trusted-firmware-rpi4 linux-image-${KERNEL_NAME}" +IMAGER_BUILD_DEPS = "rpi-firmware trusted-firmware-a-rpi4 linux-image-${KERNEL_NAME}" IMAGER_INSTALL += "${IMAGER_BUILD_DEPS}" IMAGE_BOOT_FILES = " \ @@ -26,7 +26,7 @@ IMAGE_BOOT_FILES = " \ /usr/lib/rpi-firmware/overlays/*;overlays/ \ /usr/lib/linux-image-*/broadcom/bcm2711-rpi-4-b.dtb \ /usr/lib/linux-image-*/overlays/*;overlays/ \ - /usr/lib/arm-trusted-firmware/rpi4/bl31.bin;bl31.bin \ + /usr/lib/trusted-firmware-a/rpi4/bl31.bin;bl31.bin \ /vmlinuz;kernel8.img \ " diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware-rpi4_2.2.bb b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware-rpi4_2.2.bb deleted file mode 100644 index 2dd180a..0000000 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware-rpi4_2.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2019 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -inherit dpkg - -ATF_PV = "${PV}" - -require arm-trusted-firmware_${PV}.inc - -SRC_URI += "file://rpi-rules" - -S = "${WORKDIR}/arm-trusted-firmware-${PV}" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build() { - cp ${WORKDIR}/rpi-rules ${WORKDIR}/rules - deb_debianize - - echo "build/rpi4/release/bl31.bin /usr/lib/arm-trusted-firmware/rpi4/" > ${S}/debian/install -} diff --git a/recipes-bsp/arm-trusted-firmware/files/rpi-rules b/recipes-bsp/arm-trusted-firmware/files/rpi-rules deleted file mode 100644 index abb65be..0000000 --- a/recipes-bsp/arm-trusted-firmware/files/rpi-rules +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/make -f -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2019 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- -endif - -PARALLEL_BUILD=-j $(shell echo $$(($$(nproc) * 2))) - -override_dh_auto_build: - CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_BUILD) PLAT=rpi4 - -%: - dh $@ diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb new file mode 100644 index 0000000..2a655a3 --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb @@ -0,0 +1,14 @@ +# +# Jailhouse, a Linux-based partitioning hypervisor +# +# Copyright (c) Siemens AG, 2019-2020 +# +# Authors: +# Jan Kiszka <[email protected]> +# +# SPDX-License-Identifier: MIT +# + +require trusted-firmware-a_${PV}.inc + +TF_A_PLATFORM = "rpi4" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc new file mode 100644 index 0000000..8480b0d --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc @@ -0,0 +1,17 @@ +# +# Jailhouse, a Linux-based partitioning hypervisor +# +# Copyright (c) Siemens AG, 2019-2020 +# +# Authors: +# Jan Kiszka <[email protected]> +# +# SPDX-License-Identifier: MIT +# + +require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc + +SRC_URI += "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${PV}.tar.gz"; +SRC_URI[sha256sum] = "37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21" + +S = "${WORKDIR}/trusted-firmware-a-${PV}" -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/928a923e71da182db79e78d38ff9131c33579e85.1601876389.git.jan.kiszka%40siemens.com.
