[meta-freescale] [meta-freescale-layer master][PATCH 09/19] ppa: migrate to generic ppa tree

[Zhenhua Luo]

* migrate to the generic git tree of ppc
* support ls1046a targets

Signed-off-by: Ting Liu <ting.liu at nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo at nxp.com>
---
 recipes-bsp/ppa/ppa_git.bb | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/recipes-bsp/ppa/ppa_git.bb b/recipes-bsp/ppa/ppa_git.bb
index 2332762..1e5084e 100644
--- a/recipes-bsp/ppa/ppa_git.bb
+++ b/recipes-bsp/ppa/ppa_git.bb
@@ -1,43 +1,41 @@
 SUMMARY = "Primary Protected Application"
 LICENSE = "Freescale-EULA"
-LIC_FILES_CHKSUM = "file://EULA;md5=c9ae442cf1f9dd6c13dfad64b0ffe73f"
+LIC_FILES_CHKSUM = "file://ppa/EULA.txt;md5=60037ccba533a5995e8d1a838d85799c"
 
 DEPENDS += "u-boot-mkimage-native"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/ls1043-ppa.git;branch=sdk-v2.0.x \
-    file://ppa.its \ 
-"
-SRCREV = "ffda4e6c2cfb535636ac8d667b0d2351d557cc66"
+SRC_URI = "git://git.freescale.com/ppc/sdk/ppa-generic.git;branch=sdk-v2.0.x"
+SRCREV = "cb683b7cab76f2d685f54393d3b51dd1d02dac9d"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC64="${CC}" LD64="${LD}"  OBJ64="${OBJCOPY}""
 
+PPA_PATH ?= "ppa/soc-ls1043/platform-rdb"
+PPA_PATH_ls1046a = "ppa/soc-ls1046/platform-rdb"
 PPA_NAME ?= "ppa-${MACHINE}-${DATETIME}"
 PPA_NAME[vardepsexclude] = "DATETIME"
 
 do_compile() {
-    if [ ! -e ${S}/ppa.its ]; then
-        cp ${WORKDIR}/ppa.its ${S}
-    fi
     export ARMV8_TOOLS_DIR="${STAGING_BINDIR_TOOLCHAIN}"
     export ARMV8_TOOLS_PREFIX="${TARGET_PREFIX}"
-    export FILE_NAMES_DIR="${S}/obj"
-    oe_runmake all
-    uboot-mkimage -f ppa.its ppa.itb
+    export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
+    cd ${S}/${PPA_PATH}
+    oe_runmake rdb-fit
+    cd ${S}
 }
 
 do_install() {
     install -d ${D}/boot/
-    install ${S}/ppa.itb ${D}/boot/${PPA_NAME}.itb
+    install ${S}/${PPA_PATH}/build/obj/ppa.itb ${D}/boot/${PPA_NAME}.itb
     ln -sfT ${PPA_NAME}.itb ${D}/boot/ppa.itb
 }
 
 do_deploy(){
-    install -d ${DEPLOYDIR} 
-    install ${S}/ppa.itb ${DEPLOYDIR}/${PPA_NAME}.itb
+    install -d ${DEPLOYDIR}
+    install ${S}/${PPA_PATH}/build/obj/ppa.itb ${DEPLOYDIR}/${PPA_NAME}.itb
     ln -sfT ${PPA_NAME}.itb ${DEPLOYDIR}/ppa.itb
 }
 addtask deploy before do_build after do_install
@@ -45,6 +43,7 @@ addtask deploy before do_build after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"   
 
-COMPATIBLE_MACHINE = "(ls1043ardb)"
+CLEANBROKEN = "1"
+PARALLEL_MAKE = ""
+COMPATIBLE_MACHINE = "(ls1043a|ls1046a)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-- 
2.7.4