From 88c9f817bd344438a3739ab4235b2e28b729a5f4 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Mon, 17 Apr 2023 18:51:34 +0800 Subject: qoriq-atf: Upgrade to v2.6 Signed-off-by: Jun Zhu --- recipes-bsp/atf/qoriq-atf-2.4.inc | 10 -- recipes-bsp/atf/qoriq-atf-2.6.inc | 12 ++ recipes-bsp/atf/qoriq-atf-tools_2.4.bb | 13 -- recipes-bsp/atf/qoriq-atf-tools_2.6.bb | 15 ++ .../tf-a-tests-no-warn-rwx-segments.patch | 34 ++++ recipes-bsp/atf/qoriq-atf_2.4.bb | 186 -------------------- recipes-bsp/atf/qoriq-atf_2.6.bb | 189 +++++++++++++++++++++ 7 files changed, 250 insertions(+), 209 deletions(-) delete mode 100644 recipes-bsp/atf/qoriq-atf-2.4.inc create mode 100644 recipes-bsp/atf/qoriq-atf-2.6.inc delete mode 100644 recipes-bsp/atf/qoriq-atf-tools_2.4.bb create mode 100644 recipes-bsp/atf/qoriq-atf-tools_2.6.bb create mode 100644 recipes-bsp/atf/qoriq-atf/tf-a-tests-no-warn-rwx-segments.patch delete mode 100644 recipes-bsp/atf/qoriq-atf_2.4.bb create mode 100644 recipes-bsp/atf/qoriq-atf_2.6.bb (limited to 'recipes-bsp') diff --git a/recipes-bsp/atf/qoriq-atf-2.4.inc b/recipes-bsp/atf/qoriq-atf-2.4.inc deleted file mode 100644 index 506c9538..00000000 --- a/recipes-bsp/atf/qoriq-atf-2.4.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "ARM Trusted Firmware" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - -SRC_URI = "git://github.com/nxp-qoriq/atf.git;protocol=https;nobranch=1" -SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d" - -S = "${WORKDIR}/git" - diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.6.inc new file mode 100644 index 00000000..d5ef5e75 --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf-2.6.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "ARM Trusted Firmware" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + +ATF_BRANCH ?= "lf_v2.6" +ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https" +SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}" +SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75" + +S = "${WORKDIR}/git" + diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.4.bb b/recipes-bsp/atf/qoriq-atf-tools_2.4.bb deleted file mode 100644 index eccf12c8..00000000 --- a/recipes-bsp/atf/qoriq-atf-tools_2.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -require recipes-bsp/atf/qoriq-atf-2.4.inc - -DEPENDS += "openssl" - -EXTRA_OEMAKE = "fiptool V=1 HOSTCC='${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}'" - -do_install () { - install -m 0755 -d ${D}/${bindir} - install -m 0755 ${S}/tools/fiptool/fiptool ${D}/${bindir}/ -} - -BBCLASSEXTEND = "native" - diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb b/recipes-bsp/atf/qoriq-atf-tools_2.6.bb new file mode 100644 index 00000000..2c1db306 --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf-tools_2.6.bb @@ -0,0 +1,15 @@ +require qoriq-atf-${PV}.inc + +DEPENDS += "openssl" + +PV:append = "+${SRCPV}" + +EXTRA_OEMAKE = "fiptool V=1 PLAT=lx2162aqds HOSTCC='${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}'" + +do_install () { + install -m 0755 -d ${D}/${bindir} + install -m 0755 ${S}/tools/fiptool/fiptool ${D}/${bindir}/ +} + +BBCLASSEXTEND = "native" + diff --git a/recipes-bsp/atf/qoriq-atf/tf-a-tests-no-warn-rwx-segments.patch b/recipes-bsp/atf/qoriq-atf/tf-a-tests-no-warn-rwx-segments.patch new file mode 100644 index 00000000..8412499e --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf/tf-a-tests-no-warn-rwx-segments.patch @@ -0,0 +1,34 @@ +From 9ceeb0cadffee1b1476718795d0568f6b244bf44 Mon Sep 17 00:00:00 2001 +From: Jun Zhu +Date: Mon, 31 Oct 2022 21:24:15 +0800 +Subject: [PATCH] tf-a-tests-no-warn-rwx-segments + +Binutils 2.39 now warns when a segment has RXW permissions[1]: + +aarch64-poky-linux-musl-ld: tftf.elf has a LOAD segment with RWX permissions + +There is a ticket filed upstream[2], so until that is resolved just disable the warning +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 +[2] https://developer.trustedfirmware.org/T996 + +Signed-off-by: Jun Zhu +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dccf0121d..0d082344b 100644 +--- a/Makefile ++++ b/Makefile +@@ -445,7 +445,7 @@ TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case + ifeq ($(findstring ld.lld,$(notdir $(LD))),) +-TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) ++TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) --no-warn-rwx-segments + endif + endif + +-- +2.25.1 + diff --git a/recipes-bsp/atf/qoriq-atf_2.4.bb b/recipes-bsp/atf/qoriq-atf_2.4.bb deleted file mode 100644 index ec953297..00000000 --- a/recipes-bsp/atf/qoriq-atf_2.4.bb +++ /dev/null @@ -1,186 +0,0 @@ -require recipes-bsp/atf/qoriq-atf-2.4.inc - -inherit deploy - -DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw qoriq-cst-native bc-native" -DEPENDS:append:lx2160a = " ddr-phy" -DEPENDS:append:lx2162a = " ddr-phy" -do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" - -SRC_URI += "git://github.com/ARMmbed/mbedtls;nobranch=1;destsuffix=git/mbedtls;name=mbedtls;protocol=https" -SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708" -SRCREV_FORMAT = "atf" - -COMPATIBLE_MACHINE = "(qoriq)" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PLATFORM = "${MACHINE}" -PLATFORM:ls1088ardb-pb = "ls1088ardb" -PLATFORM_ADDITIONAL_TARGET ??= "" -PLATFORM_ADDITIONAL_TARGET:ls1012afrwy = "ls1012afrwy_512mb" - -RCW_FOLDER ?= "${MACHINE}" -RCW_FOLDER:ls1088ardb-pb = "ls1088ardb" -RCW_FOLDER:lx2160ardb = "lx2160ardb_rev2" - -RCW_SUFFIX ?= ".bin" -RCW_SUFFIX:ls1012a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '_default.bin', d)}" -RCW_SUFFIX:ls1043a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '.bin', d)}" -RCW_SUFFIX:ls1046a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '.bin', d)}" - -UBOOT_BINARY ?= "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot', '${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa', d)}" - -SECURE_EXTENTION ?= "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sec', '', d)}" - -BOOTTYPE ?= "nor nand qspi flexspi_nor sd emmc" - -chassistype ?= "ls2088_1088" -chassistype:ls1012a = "ls104x_1012" -chassistype:ls1043a = "ls104x_1012" -chassistype:ls1046a = "ls104x_1012" - -DDR_PHY_BIN_PATH ?= "" -DDR_PHY_BIN_PATH:lx2160a = "${DEPLOY_DIR_IMAGE}/ddr-phy" -DDR_PHY_BIN_PATH:lx2162a = "${DEPLOY_DIR_IMAGE}/ddr-phy" - -# requires CROSS_COMPILE set by hand as there is no configure script -export CROSS_COMPILE="${TARGET_PREFIX}" -export ARCH="arm64" - -# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is -# a standalone application -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -EXTRA_OEMAKE += "HOSTCC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}'" -EXTRA_OEMAKE += "\ - ${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'BL32=${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin SPD=opteed', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'TRUSTED_BOARD_BOOT=1 CST_DIR=${RECIPE_SYSROOT_NATIVE}/usr/bin/cst', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'arm-cot', 'GENERATE_COT=1 MBEDTLS_DIR=${S}/mbedtls', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'fuse', 'fip_fuse FUSE_PROG=1 FUSE_PROV_FILE=fuse_scr.bin', '', d)} \ -" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \ -" -PACKAGECONFIG[optee] = ",,optee-os-qoriq" - -python() { - if bb.utils.contains("DISTRO_FEATURES", "arm-cot", True, False, d): - if not bb.utils.contains("DISTRO_FEATURES", "secure", True, False, d): - bb.fatal("arm-cot needs 'secure' being set in DISTRO_FEATURES") -} - -do_configure[noexec] = "1" - -do_compile() { - if [ ! -f ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri ]; then - ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/gen_keys 1024 - else - cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri . - cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pub . - fi - - ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/gen_fusescr \ - ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/input_files/gen_fusescr/${chassistype}/input_fuse_file - - for d in ${BOOTTYPE}; do - case $d in - nor) - rcwimg="${RCWNOR}${RCW_SUFFIX}" - uefiboot="${UEFI_NORBOOT}" - ;; - nand) - rcwimg="${RCWNAND}${RCW_SUFFIX}" - ;; - qspi) - rcwimg="${RCWQSPI}${RCW_SUFFIX}" - uefiboot="${UEFI_QSPIBOOT}" - if [ -n "${SECURE_EXTENTION}" ] && [ "${MACHINE}" = ls1046ardb ]; then - rcwimg="RR_FFSSPPPH_1133_5559/rcw_1600_qspiboot_sben.bin" - fi - ;; - auto) - rcwimg="${RCWAUTO}${RCW_SUFFIX}" - ;; - sd) - rcwimg="${RCWSD}${RCW_SUFFIX}" - ;; - emmc) - rcwimg="${RCWEMMC}${RCW_SUFFIX}" - ;; - flexspi_nor) - rcwimg="${RCWXSPI}${RCW_SUFFIX}" - uefiboot="${UEFI_XSPIBOOT}" - ;; - esac - - if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then - make V=1 realclean - if [ -f rot_key.pem ];then - mkdir -p build/${PLATFORM}/release/ - cp *.pem build/${PLATFORM}/release/ - fi - - oe_runmake V=1 all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${UBOOT_BINARY} - cp build/${PLATFORM}/release/bl2_${d}${SECURE_EXTENTION}.pbl . - cp build/${PLATFORM}/release/fip.bin fip_uboot${SECURE_EXTENTION}.bin - if [ -e build/${PLATFORM}/release/fuse_fip.bin ]; then - cp build/${PLATFORM}/release/fuse_fip.bin . - fi - - if [ -n "${SECURE_EXTENTION}" -a -n "${DDR_PHY_BIN_PATH}" -a ! -f ddr_fip_sec.bin ]; then - oe_runmake V=1 fip_ddr PLAT=${PLATFORM} DDR_PHY_BIN_PATH=${DDR_PHY_BIN_PATH} - if [ -e build/${PLATFORM}/release/ddr_fip_sec.bin ]; then - cp build/${PLATFORM}/release/ddr_fip_sec.bin . - fi - fi - - if [ -e build/${PLATFORM}/release/rot_key.pem ] && [ ! -f rot_key.pem ]; then - cp build/${PLATFORM}/release/*.pem . - fi - - if [ -n "${PLATFORM_ADDITIONAL_TARGET}" ]; then - make V=1 realclean - oe_runmake V=1 all fip pbl PLAT=${PLATFORM_ADDITIONAL_TARGET} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${UBOOT_BINARY} - cp build/${PLATFORM_ADDITIONAL_TARGET}/release/bl2_${d}${SECURE_EXTENTION}.pbl bl2_${d}${SECURE_EXTENTION}_${PLATFORM_ADDITIONAL_TARGET}.pbl - cp build/${PLATFORM_ADDITIONAL_TARGET}/release/fip.bin fip_uboot${SECURE_EXTENTION}_${PLATFORM_ADDITIONAL_TARGET}.bin - if [ -e build/${PLATFORM_ADDITIONAL_TARGET}/release/fuse_fip.bin ]; then - cp build/${PLATFORM_ADDITIONAL_TARGET}/release/fuse_fip.bin fuse_fip_${PLATFORM_ADDITIONAL_TARGET}.bin - fi - fi - - if [ -z "${SECURE_EXTENTION}" -a -f "${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot}" ]; then - make V=1 realclean - oe_runmake V=1 all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot} - cp build/${PLATFORM}/release/fip.bin fip_uefi.bin - fi - fi - rcwimg="" - uefiboot="" - done -} - -do_install() { - install -d ${D}/boot/atf/ - cp srk.pri ${D}/boot/atf/ - cp srk.pub ${D}/boot/atf/ - cp *.pbl ${D}/boot/atf/ - if [ ! -e fuse_fip.bin ]; then - rm -f fuse_scr.bin - fi - cp *.bin ${D}/boot/atf/ - chown -R root:root ${D} -} - -do_deploy() { - install -d ${DEPLOYDIR}/atf/ - cp ${D}/boot/atf/* ${DEPLOYDIR}/atf/ -} -addtask deploy after do_install - -FILES:${PN} += "/boot" -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/atf/qoriq-atf_2.6.bb b/recipes-bsp/atf/qoriq-atf_2.6.bb new file mode 100644 index 00000000..6ab938d8 --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf_2.6.bb @@ -0,0 +1,189 @@ +require qoriq-atf-${PV}.inc + +inherit deploy + +DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw qoriq-cst-native bc-native" +do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" + +PV:append = "+${SRCPV}" + +SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \ + git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=git/ddr-phy-binary;name=ddr \ + file://tf-a-tests-no-warn-rwx-segments.patch \ +" +SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708" +SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba" +SRCREV_FORMAT = "atf" + +COMPATIBLE_MACHINE = "(qoriq)" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PLATFORM = "${MACHINE}" +PLATFORM:ls1088ardb-pb = "ls1088ardb" +PLATFORM:lx2160ardb-rev2 = "lx2160ardb" +PLATFORM_ADDITIONAL_TARGET ??= "" +PLATFORM_ADDITIONAL_TARGET:ls1012afrwy = "ls1012afrwy_512mb" + +RCW_FOLDER ?= "${MACHINE}" +RCW_FOLDER:ls1088ardb-pb = "ls1088ardb" +RCW_FOLDER:lx2160ardb = "lx2160ardb_rev2" +RCW_FOLDER:lx2160ardb-rev2 = "lx2160ardb_rev2" + +RCW_SUFFIX ?= ".bin" +RCW_SUFFIX:ls1012a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '_default.bin', d)}" +RCW_SUFFIX:ls1043a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '.bin', d)}" +RCW_SUFFIX:ls1046a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sben.bin', '.bin', d)}" + +UBOOT_BINARY ?= "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot', '${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa', d)}" + +SECURE_EXTENTION ?= "${@bb.utils.contains('DISTRO_FEATURES', 'secure', '_sec', '', d)}" + +BOOTTYPE ?= "nor nand qspi flexspi_nor sd emmc" + +chassistype ?= "ls2088_1088" +chassistype:ls1012a = "ls104x_1012" +chassistype:ls1043a = "ls104x_1012" +chassistype:ls1046a = "ls104x_1012" + +FIP_DDR ?= "" +FIP_DDR:lx2160a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'fip_ddr', '', d)}" +FIP_DDR:lx2162a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'fip_ddr', '', d)}" + +# requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE="${TARGET_PREFIX}" +export ARCH="arm64" + +# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is +# a standalone application +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + +EXTRA_OEMAKE += "HOSTCC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}'" +EXTRA_OEMAKE += "\ + ${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'BL32=${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin SPD=opteed', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'TRUSTED_BOARD_BOOT=1 CST_DIR=${RECIPE_SYSROOT_NATIVE}/usr/bin/cst', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'arm-cot', 'GENERATE_COT=1 MBEDTLS_DIR=${S}/mbedtls', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'fuse', 'fip_fuse FUSE_PROG=1 FUSE_PROV_FILE=fuse_scr.bin', '', d)} \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \ +" +PACKAGECONFIG[optee] = ",,optee-os-qoriq" + +python() { + if bb.utils.contains("DISTRO_FEATURES", "arm-cot", True, False, d): + if not bb.utils.contains("DISTRO_FEATURES", "secure", True, False, d): + bb.fatal("arm-cot needs 'secure' being set in DISTRO_FEATURES") +} + +do_configure[noexec] = "1" + +do_compile() { + if [ ! -f ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri ]; then + ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/gen_keys 1024 + else + cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri . + cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pub . + fi + + ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/gen_fusescr \ + ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/input_files/gen_fusescr/${chassistype}/input_fuse_file + + for d in ${BOOTTYPE}; do + case $d in + nor) + rcwimg="${RCWNOR}${RCW_SUFFIX}" + uefiboot="${UEFI_NORBOOT}" + ;; + nand) + rcwimg="${RCWNAND}${RCW_SUFFIX}" + ;; + qspi) + rcwimg="${RCWQSPI}${RCW_SUFFIX}" + uefiboot="${UEFI_QSPIBOOT}" + if [ -n "${SECURE_EXTENTION}" ] && [ "${MACHINE}" = ls1046ardb ]; then + rcwimg="RR_FFSSPPPH_1133_5559/rcw_1600_qspiboot_sben.bin" + fi + ;; + auto) + rcwimg="${RCWAUTO}${RCW_SUFFIX}" + ;; + sd) + rcwimg="${RCWSD}${RCW_SUFFIX}" + ;; + emmc) + rcwimg="${RCWEMMC}${RCW_SUFFIX}" + ;; + flexspi_nor) + rcwimg="${RCWXSPI}${RCW_SUFFIX}" + uefiboot="${UEFI_XSPIBOOT}" + ;; + esac + + if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then + make V=1 realclean + if [ -f rot_key.pem ];then + mkdir -p build/${PLATFORM}/release/ + cp *.pem build/${PLATFORM}/release/ + fi + + oe_runmake V=1 all fip pbl ${FIP_DDR} PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${UBOOT_BINARY} + cp build/${PLATFORM}/release/bl2_${d}${SECURE_EXTENTION}.pbl . + cp build/${PLATFORM}/release/fip.bin fip_uboot${SECURE_EXTENTION}.bin + if [ -e build/${PLATFORM}/release/fuse_fip.bin ]; then + cp build/${PLATFORM}/release/fuse_fip.bin . + fi + + if [ -e build/${PLATFORM}/release/ddr_fip_sec.bin ] && [ ! -f ddr_fip_sec.bin ]; then + cp build/${PLATFORM}/release/ddr_fip_sec.bin . + fi + + if [ -e build/${PLATFORM}/release/rot_key.pem ] && [ ! -f rot_key.pem ]; then + cp build/${PLATFORM}/release/*.pem . + fi + + if [ -n "${PLATFORM_ADDITIONAL_TARGET}" ]; then + make V=1 realclean + oe_runmake V=1 all fip pbl PLAT=${PLATFORM_ADDITIONAL_TARGET} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${UBOOT_BINARY} + cp build/${PLATFORM_ADDITIONAL_TARGET}/release/bl2_${d}${SECURE_EXTENTION}.pbl bl2_${d}${SECURE_EXTENTION}_${PLATFORM_ADDITIONAL_TARGET}.pbl + cp build/${PLATFORM_ADDITIONAL_TARGET}/release/fip.bin fip_uboot${SECURE_EXTENTION}_${PLATFORM_ADDITIONAL_TARGET}.bin + if [ -e build/${PLATFORM_ADDITIONAL_TARGET}/release/fuse_fip.bin ]; then + cp build/${PLATFORM_ADDITIONAL_TARGET}/release/fuse_fip.bin fuse_fip_${PLATFORM_ADDITIONAL_TARGET}.bin + fi + fi + + if [ -z "${SECURE_EXTENTION}" -a -f "${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot}" ]; then + make V=1 realclean + oe_runmake V=1 all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot} + cp build/${PLATFORM}/release/fip.bin fip_uefi.bin + fi + fi + rcwimg="" + uefiboot="" + done +} + +do_install() { + install -d ${D}/boot/atf/ + cp srk.pri ${D}/boot/atf/ + cp srk.pub ${D}/boot/atf/ + cp *.pbl ${D}/boot/atf/ + if [ ! -e fuse_fip.bin ]; then + rm -f fuse_scr.bin + fi + cp *.bin ${D}/boot/atf/ + chown -R root:root ${D} +} + +do_deploy() { + install -d ${DEPLOYDIR}/atf/ + cp ${D}/boot/atf/* ${DEPLOYDIR}/atf/ +} +addtask deploy after do_install + +FILES:${PN} += "/boot" +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf