2 files changed, 22 insertions, 15 deletions

diff --git a/recipes-bsp/atf/qoriq-atf-2.12.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index 26d79b4a1..91a412547 100644
--- a/recipes-bsp/atf/qoriq-atf-2.12.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -1,5 +1,8 @@
-DESCRIPTION = "ARM Trusted Firmware"
+SUMMARY = "ARM Trusted Firmware for QorIQ"
+DESCRIPTION = "ARM Trusted Firmware (TF-A) for NXP QorIQ Layerscape SoCs."
+HOMEPAGE = "https://github.com/nxp-qoriq/atf"
 
+SECTION = "bsp"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
diff --git a/recipes-bsp/atf/qoriq-atf_2.12.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 4eb7be9d3..f78de99f7 100644
--- a/recipes-bsp/atf/qoriq-atf_2.12.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -2,18 +2,25 @@ require qoriq-atf-${PV}.inc
 
 inherit deploy
 
-DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw qoriq-cst-native bc-native"
+DEPENDS += "bc-native openssl openssl-native qoriq-cst-native rcw u-boot u-boot-mkimage-native"
 do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
 
+# Version suffix must join without a leading space to stay a valid PV.
+# nooelint: oelint.vars.inconspaces
 PV:append = "+${SRCPV}"
 
 SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=${S}/mbedtls;name=mbedtls \
-    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
+            git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
 "
 SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
 SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
 SRCREV_FORMAT = "atf"
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \
+"
+PACKAGECONFIG[optee] = ",,optee-os-qoriq"
+
 COMPATIBLE_MACHINE = "(qoriq)"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -68,11 +75,8 @@ EXTRA_OEMAKE += "\
     ${@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"
-
+# Parse-time validation that arm-cot implies secure; needs an anonymous python.
+# nooelint: oelint.task.noanonpython
 python() {
     if bb.utils.contains("DISTRO_FEATURES", "arm-cot", True, False, d):
         if not bb.utils.contains("DISTRO_FEATURES", "secure", True, False, d):
@@ -120,10 +124,10 @@ do_compile() {
         flexspi_nor)
             rcwimg="${RCWXSPI}${RCW_SUFFIX}"
             uefiboot="${UEFI_XSPIBOOT}"
-            ;;        
+            ;;
         esac
-            
-        if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then
+
+    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/
@@ -168,13 +172,13 @@ do_compile() {
 
 do_install() {
     install -d ${D}/boot/atf/
-    cp srk.pri ${D}/boot/atf/
-    cp srk.pub ${D}/boot/atf/
-    cp *.pbl ${D}/boot/atf/
+    install -m 0644 srk.pri ${D}/boot/atf/
+    install -m 0644 srk.pub ${D}/boot/atf/
+    install -m 0644 *.pbl ${D}/boot/atf/
     if [ ! -e fuse_fip.bin ]; then
         rm -f fuse_scr.bin
     fi
-    cp *.bin ${D}/boot/atf/
+    install -m 0644 *.bin ${D}/boot/atf/
     chown -R root:root ${D}
 }