Get it working for honister

Signed-off-by: Jon Mason <jdmason@kudzu.us>

ci/base.yml

@@ -5,7 +5,7 @@ distro: poky
 
 defaults:
   repos:
-    refspec: hardknott
+    refspec: honister
 
 repos:
   meta-lx2k:
@@ -33,7 +33,7 @@ env:
 
 local_conf_header:
   base: |
-    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
     INHERIT += "rm_work"
 
 machine: unset

classes/lx2k_fw_img.bbclass

@@ -21,7 +21,7 @@ DPC_SYMLINK ?= "dpc-8_x_usxgmii.dtb"
 DPC_OFFSET ?= "28672"
 
 
-IMAGE_CMD_lx2k_fw_img () {
+IMAGE_CMD:lx2k_fw_img () {
 	dd if=${DEPLOY_DIR_IMAGE}/${BL2_SYMLINK} of=${FWIMG} bs=512 seek=${BL2_OFFSET} conv=notrunc
 	dd if=${DEPLOY_DIR_IMAGE}/${FIP_SYMLINK} of=${FWIMG} bs=512 seek=${FIP_OFFSET} conv=notrunc
 	dd if=${DEPLOY_DIR_IMAGE}/${FIP_DDR_SYMLINK} of=${FWIMG} bs=512 seek=${FIP_DDR_OFFSET} conv=notrunc

conf/layer.conf

@@ -10,4 +10,4 @@ BBFILE_PATTERN_lx2k-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_lx2k-layer = "5"
 
 LAYERDEPENDS_lx2k-layer = "core openembedded-layer meta-arm"
-LAYERSERIES_COMPAT_lx2k-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_lx2k-layer = "honister"

recipes-bsp/ddr-phy-binary/ddr-phy-binary_git.bb

@@ -3,7 +3,7 @@ LICENSE = "Proprietary"
 
 inherit deploy
 
-SRC_URI = "git://github.com/NXP/ddr-phy-binary.git;protocol=https"
+SRC_URI = "git://github.com/NXP/ddr-phy-binary.git;protocol=https;nobranch=1"
 SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
 
 LIC_FILES_CHKSUM = "file://README;md5=2b2ebcf79004f09c37fc79affccc8bbe"

recipes-bsp/trusted-firmware-a/files/yocto.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 94ae63ea2..1744753c0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -163,7 +163,7 @@ ASFLAGS			+=	$(CPPFLAGS) $(ASFLAGS_$(ARCH))			\
+ 				-D__ASSEMBLY__ -ffreestanding 			\
+ 				-Wa,--fatal-warnings
+ TF_CFLAGS		+=	$(CPPFLAGS) $(TF_CFLAGS_$(ARCH))		\
+-				-ffreestanding -fno-builtin -Wall -std=gnu99	\
++				-ffreestanding -fno-builtin -std=gnu99	\
+ 				-Os -ffunction-sections -fdata-sections
+ 
+ GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)

recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bbappend

@@ -1,5 +1,5 @@
 THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:"
+FILESEXTRAPATHS:prepend = "${THISDIR}/files/:"
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;protocol=https;nobranch=1 \
            file://0001-plat-nxp-fsl_sec-Mask-job-ring-interrupts-in-POLLING.patch \
@@ -17,6 +17,7 @@ SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;proto
            file://0013-plat-nxp-sfp-driver-GPIO-fixes-and-PPWM-setting.patch \
            file://0014-lx2160acex7-add-timer-based-counter.patch \
            file://0015-plat-nxp-add-tool-print-when-choosing-autodetect-mod.patch \
+           file://yocto.patch \
           "
 SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a"
 
@@ -31,6 +32,6 @@ EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '0', 'BL33=${DEPLOY_DIR_IMAGE
 
 do_compile[depends] += "rcw:do_deploy"
 
-do_deploy_append() {
+do_deploy:append() {
         install -m 0644 ${BUILD_DIR}/bl2_${BOOT}.pbl ${DEPLOYDIR}/
 }

recipes-devtools/fiptool/fiptool-native_1.5.bb

@@ -0,0 +1,31 @@
+# Firmware Image Package (FIP)
+# It is a packaging format used by TF-A to package the
+# firmware images in a single binary.
+
+DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
+LICENSE = "BSD-3-Clause"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;protocol=https;nobranch=1"
+LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"
+
+# Use fiptool from TF-A v1.5
+SRCREV = "4a82c939a0211196e2b80a495f966383803753bb"
+
+DEPENDS += "openssl-native"
+
+inherit native
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+    # These changes are needed to have the fiptool compiling and executing properly
+    sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
+    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
+
+    oe_runmake fiptool
+}
+
+do_install () {
+    install -d ${D}${bindir}/
+    install -m 0755 tools/fiptool/fiptool ${D}${bindir}
+}

recipes-devtools/fiptool/fiptool-native_1.5.bbappend

@@ -1,3 +0,0 @@
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;protocol=https;nobranch=1 \
-          "
-SRCREV = "4a82c939a0211196e2b80a495f966383803753bb"