[PATCH v2 01/41] fmc: update to c7576ab

[PATCH v2 01/41] fmc: update to c7576ab

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes:
c7576ab - Resolved compile warning on ubuntu with aarch64-linux-gnu-g++ v7.3

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 4812ca3..cbf8e24 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -7,7 +7,7 @@ PR = "r2"
 DEPENDS = "libxml2 fmlib tclap"
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1"
-SRCREV = "09a497fe92aa6cf784140b9084bccf4aaaa97700"
+SRCREV = "c7576ab7fb6fb09b68ebc40531e5452fc89e5cd5"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 02/41] ls2-phy: update COMPATIBLE_MACHINE for lx2160a

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/ls2-phy/ls2-phy_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index 30c161c..18a63b1 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -23,6 +23,6 @@ addtask deploy before do_build after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2088ardb|t2080|t4240)"
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2088ardb|t2080|t4240|lx2160a)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-- 
2.7.4

[PATCH v2 03/41] mc-utils: update to 6aca560

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes:
update COMPATIBLE_MACHINE for qoriq-arm64
6aca560 - config: lx2160a: add dprtc object
73eec5c - api: add MC 10.13.0 APIs
022adf2 - api: add MC 10.12.0 APIs
f3e4205 - api: add MC 10.11.2 APIs
cb2afb7 - api: add MC 10.11.1 APIs
65aeed6 - config: update number of necessary dpmcp
1370e38 - Add dpc with USXGMII for QDS protocol 7

*Update COMPATIBLE_MACHINE for qoriq-arm64

*Support lx2160a

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/mc-utils/mc-utils_git.bb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index f34d441..430d6cd 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -10,30 +10,36 @@ DEPENDS += "dtc-native"
 inherit deploy
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils;nobranch=1"
-SRCREV = "30c63101b15def4620f509641b97641c25fe19fe"
+SRCREV = "6aca560c630dc54afdef382c506f214b28f4985e"
 
 S = "${WORKDIR}/git"
 
 MC_CFG ?= ""
 MC_CFG_ls1088a = "ls1088a"
 MC_CFG_ls2088a = "ls2088a"
+MC_CFG_lx2160a = "lx2160a"
 
 do_install () {
 	oe_runmake -C config 
 
-	install -d ${D}/boot/mc-utils/custom
+	install -d ${D}/boot/mc-utils
 	cp -r ${S}/config/${MC_CFG}/RDB/*.dtb ${D}/boot/mc-utils
-        cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${D}/boot/mc-utils/custom
+        if [ -d ${S}/config/${MC_CFG}/RDB/custom/ ]; then
+            install -d ${D}/boot/mc-utils/custom
+            cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${D}/boot/mc-utils/custom
+        fi
 }
 
 do_deploy () {
-	install -d ${DEPLOYDIR}/mc-utils/custom
+	install -d ${DEPLOYDIR}/mc-utils
 	cp -r ${S}/config/${MC_CFG}/RDB/*.dtb ${DEPLOYDIR}/mc-utils
-        cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${DEPLOYDIR}/mc-utils/custom
-        
+        if [ -d ${S}/config/${MC_CFG}/RDB/custom/ ]; then
+            install -d ${DEPLOYDIR}/mc-utils/custom
+            cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${DEPLOYDIR}/mc-utils/custom
+        fi
 }
 addtask deploy after do_install
 
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
-COMPATIBLE_MACHINE = "(ls1088a|ls2088a)"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.7.4

[PATCH v2 04/41] inphi: add recipes

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:
f22e9ff - in112525: Add Inphi 112525 10G Phy firmware

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/inphi/inphi_git.bb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 recipes-bsp/inphi/inphi_git.bb

diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb
new file mode 100644
index 0000000..c0c8a77
--- /dev/null
+++ b/recipes-bsp/inphi/inphi_git.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Firmwares and Standalone Applications"
+LICENSE = "NXP-Binary-EULA"
+LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798"
+
+inherit deploy fsl-eula-unpack
+
+SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;fsl-eula=true;nobranch=1"
+SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695"
+
+S = "${WORKDIR}/git"
+
+do_install () {
+    install -d ${D}/boot
+    cp -fr ${S}/in112525-phy-ucode.txt ${D}/boot
+}
+
+do_deploy () {
+    install -d ${DEPLOYDIR}/inphi
+    cp -fr ${S}/in112525-phy-ucode.txt ${DEPLOYDIR}/inphi
+}
+addtask deploy before do_build after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"
+
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
-- 
2.7.4

[PATCH v2 05/41] ppa: remove ppa

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*This pkg will not be supported anymore

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/ppa/ppa-optee_git.bb | 18 --------------
 recipes-bsp/ppa/ppa.inc          | 54 ----------------------------------------
 recipes-bsp/ppa/ppa_git.bb       | 20 ---------------
 3 files changed, 92 deletions(-)
 delete mode 100644 recipes-bsp/ppa/ppa-optee_git.bb
 delete mode 100644 recipes-bsp/ppa/ppa.inc
 delete mode 100644 recipes-bsp/ppa/ppa_git.bb

diff --git a/recipes-bsp/ppa/ppa-optee_git.bb b/recipes-bsp/ppa/ppa-optee_git.bb
deleted file mode 100644
index 41896ba..0000000
--- a/recipes-bsp/ppa/ppa-optee_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require ppa.inc
-
-DEPENDS += "optee-os-qoriq"
-
-PPA_PATH_ls1046a = "ls1046"
-PPA_PATH_ls1043a = "ls1043"
-PPA_PATH_ls1012a = "ls1012"
-PPA_PATH_ls2088a = "ls2088"
-
-do_compile() {
-    export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-    cp ${RECIPE_SYSROOT}/lib/firmware/tee_${MACHINE}.bin ${S}/ppa/soc-${PPA_PATH}/tee.bin
-    cd ${S}/ppa
-    ./build rdb-fit spd=on ${PPA_PATH}
-    cd ${S}
-}
-
-COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls1012a|ls2088a)"
diff --git a/recipes-bsp/ppa/ppa.inc b/recipes-bsp/ppa/ppa.inc
deleted file mode 100644
index 8125375..0000000
--- a/recipes-bsp/ppa/ppa.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY = "Primary Protected Application"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://license.txt;md5=2ecf925c01a48f61c88f78c30fe2ee3b"
-
-DEPENDS += "u-boot-mkimage-native dtc-native"
-
-inherit deploy
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ppa-generic;nobranch=1 \
-"
-SRCREV = "90e13c9e148972f75f5f2e7f7a904dabf1586049"
-
-S = "${WORKDIR}/git"
-
-python () {
-    ml = d.getVar("MULTILIB_VARIANTS", True)
-    arch = d.getVar("OVERRIDES", True)
-    if "fsl-lsch2-32b:" in arch:
-        if not "lib64" in ml:
-            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
-}
-
-WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-EXTRA_OEMAKE = 'CC64="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" LD64="${WRAP_TARGET_PREFIX}ld ${TOOLCHAIN_OPTIONS}"  OBJ64="${WRAP_TARGET_PREFIX}objcopy"'
-
-PPA_NAME = "${PN}-${MACHINE}-${DATETIME}"
-PPA_NAME[vardepsexclude] = "DATETIME"
-
-do_install() {
-    install -d ${D}/boot/
-    install ${S}/ppa/soc-${PPA_PATH}/build/obj/ppa.itb ${D}/boot/${PPA_NAME}.itb
-    ln -sfT ${PPA_NAME}.itb ${D}/boot/${PN}.itb
-}
-
-do_deploy(){
-    install -d ${DEPLOYDIR}
-    install ${S}/ppa/soc-${PPA_PATH}/build/obj/ppa.itb ${DEPLOYDIR}/${PPA_NAME}.itb
-    ln -sfT ${PPA_NAME}.itb ${DEPLOYDIR}/${PN}.itb
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"   
-
-CLEANBROKEN = "1"
-PARALLEL_MAKE = ""
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/ppa/ppa_git.bb b/recipes-bsp/ppa/ppa_git.bb
deleted file mode 100644
index 5413d7d..0000000
--- a/recipes-bsp/ppa/ppa_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require ppa.inc
-
-PPA_PATH_ls1012a = "ls1012"
-PPA_PATH_ls1043a = "ls1043"
-PPA_PATH_ls1046a = "ls1046"
-PPA_PATH_ls2088a = "ls2088"
-PPA_PATH_ls1088a = "ls1088"
-
-do_compile () {
-    export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-    cd ${S}/ppa
-    if [ ${MACHINE} = ls1012afrdm ];then
-        ./build  frdm-fit ${PPA_PATH}
-    else
-        ./build  rdb-fit ${PPA_PATH}
-    fi
-    cd ${S}
-}
-
-COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1012a|ls1088a)"
-- 
2.7.4

[PATCH v2 06/41] rcw: update to 17254ac

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*Update to lsdk 1812 tag
include the following changes:
17254ac - ls1046ardb: fix QSPI clock frequecy per data sheet
95691bc - qspi: use byte_swap.tcl under board directory for special board
fabb891 - ls2088a: Add ls2088ardb 2a_3d RCW configuration files
bf52634 - arm64: ls2088a: Add the workaround of errata A-008851 for 2a_3d
fe027eb - ls1043a: Add RCW file for nand and sd secure boot
6ea379b - ls1043aqds: Add RCW file for nand and sd boot
88dea67 - ls1043ardb: Add RCW file for nand and sd boot
45b2220 - ls1046a: add rcw file for nand sd and emmc secure boot
a45082b - ls1046aqds: add rcw file for nand and sd boot
7ae30ab - ls1046ardb: add rcw file for emmc and sd boot
6cd0092 - ls1043aqds: Add RCW file for ls1043aqds to support TF-A
99f1447 - lx2160aqds: Add lx2160aqds RCW configuration files
bc65c4a - lx2160ardb: Add lx2160ardb RCW configuration files
d7f12f8 - LX2160: Add lx2160asi silicon RCW configuration files

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/rcw/rcw_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index b5ca24c..c6bdad2 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "change-file-endianess-native tcl-native"
 inherit deploy siteinfo
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/rcw;nobranch=1"
-SRCREV = "04ec3bbc210fd0d7762c26c0e72182eca5e26deb"
+SRCREV = "17254ac35250197877c6321f9d13e33b1f85388a"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 07/41] uefi: update to 5b259f7

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*Update to lsdk 1812 tag
include the following changes:
5b259f7 - uefi-binaries: update for LSDK 1812-TC6
f87588d - uefi-binaries: update for LSDK 1812-TC5
5ae5001 - LSDK1812-TC4: binaries update
0c81f1f - uefi binaries: update
7bf60e6 - uefi binaries: update
ea9630f - update binaries for LSDK 18.12

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/uefi/uefi_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index baf430d..4d08782 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
 inherit deploy fsl-eula-unpack
 
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;fsl-eula=true;nobranch=1"
-SRCREV= "e48de4f75d51efcc29cd47a6c295ae680b1babe9"
+SRCREV= "5b259f75decbc478bcab0612d79a58562bef1838"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 08/41] u-boot-qoriq: Upgrade version to 2018.09

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
c08de7c - SecureBoot_LX2160A: Correct the kernel header offset.
619d0d3 - ls2080ardb: check enablement of QSPI using DCFG_RCWSR15
0dfcc1f - ls1088a: Update the device tree for IFC/QSPI
8875034 - net/phy: Cortina CS4223 driver updates & bugfixes
88fa585 - mmc: fsl_esdhc: make get_cd work well in dm_mmc_ops
2211378 - Revert "pci: layerscape: Add the dts fixup for EP and RC"
f8358cf - armv8: fsl-layerscape: properly configure qdma ICID
f24e259 - lx2160: Enable support of EMC2305
1a858e3 - armv8: emc2305: add support for fan controller
f37025a - fsl-ls2088ardb: dts: enabling SATA node
ff3e128 - board/ls1046aqds: Bypass xfi port fixup for KR mode on LS1046AQDS
2c3c67e - armv8: ls2088ardb: change default device tree in defconfig for TFABOOT
7f79b25 - armv8: ls1088aqds: add support for ifc-nor boot for TFABOOT
c1b55a8 - detect ifc-nor flash at run-time
6c99ca4 - pci: layerscape: Add the dts fixup for EP and RC
ccfc35d - pci: layerscape: Do not scan when PEX work in EP mode
dd167bc - pci: layerscape: Modify the EP and RC mode judge method
26defec - armv8,lx2160a: Initialize ethernet array in serdes_init
2851185 - armv8: lx2160a: Update CONFIG_SYS_FSL_PEBUF_BASE
cce8348 - board/ls2088ardb: Update the device tree for IFC/QSPI
830ac80 - Correct QSPI bootcommand for LS2088 TFA boot
899e696 - ls2088ardb: add QSPI support for TFA-BOOT
a9fb32b - ls1043a: add support for nand-boot cmd for TFA
c2b3374 - arm64: lx2160ardb: enable DM support for sata
0f80b76 - armv8: dts: fsl-lx2160a: add sata node support
a10b3fc - board/lx2160a: Update xspi_bootcmd, sd_bootcmd env
ee09465 - armv8:LX2160: Adds distro secure boot support.
9a7d1e0 - drivers/spi: Disable hybrid mode for SPANSION S25FS-S family
6b04587 - drivers/spi: Introduce functions to read/write any register
a748abd - fsl_qspi: Modify handling of RDAR, WRAR, 4K_ERASE commands
2af4cbd - armv8: lx2160a: Modify dspi1 controller intrrupts property
612bc35 - Enable sata configs to Kconfig for all LayerScape boards
358229b - armv8: ls1043aqds: modify the qspi_bootcmd definition

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc | 19 ++++++
 recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb         | 79 ----------------------
 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb         | 79 ++++++++++++++++++++++
 3 files changed, 98 insertions(+), 79 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb

diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
new file mode 100644
index 0000000..a3a554c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
@@ -0,0 +1,19 @@
+
+inherit fsl-u-boot-localversion
+
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \
+"
+SRCREV= "c08de7c3c92d45a824500ad936f4d72465c181ec"
+
+S = "${WORKDIR}/git"
+PV_append = "+fslgit"
+LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
deleted file mode 100644
index 0ad754f..0000000
--- a/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-qoriq-common_${PV}.inc
-
-DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
-PROVIDES += "u-boot"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
-DEPENDS_append_qoriq-arm64 = " change-file-endianess-native dtc-native tcl-native"
-DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
-DEPENDS_append_qoriq-ppc = " boot-format-native"
-
-python () {
-    if d.getVar("TCMODE", True) == "external-fsl":
-        return
-
-    ml = d.getVar("MULTILIB_VARIANTS", True)
-    arch = d.getVar("OVERRIDES", True)
-
-    if "e5500-64b:" in arch or "e6500-64b:" in arch:
-        if not "lib32" in ml:
-            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-')
-    elif "fsl-lsch2-32b:" in arch:
-        if not "lib64" in ml:
-            raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
-}
-
-LE_UBOOT_FOR_ARMBE_TARGET ?= "0"
-ENDIANNESS_GCC = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-mlittle-endian", "", d)}"
-ENDIANNESS_LD = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-EL", "", d)}"
-
-WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${ENDIANNESS_GCC}" LD="${WRAP_TARGET_PREFIX}ld ${ENDIANNESS_LD}" V=1'
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
-
-do_compile_append_qoriq() {
-    unset i j k
-    for config in ${UBOOT_MACHINE}; do
-        i=`expr $i + 1`;
-        for type in ${UBOOT_CONFIG}; do
-            j=`expr $j + 1`;
-            for binary in ${UBOOT_BINARIES}; do
-                k=`expr $k + 1`
-                if [ $j -eq $i ] && [ $k -eq $i ]; then
-                    if [ -n "${BOOTFORMAT_CONFIG}" ] && echo "${type}" |grep -q spi;then
-                        # regenerate spi binary if BOOTFORMAT_CONFIG is set
-                        boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
-                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
-                        cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                    elif [ "qspi" = "${type}" ];then
-                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
-                    fi
-                fi
-            done
-            unset k
-        done
-        unset j
-    done
-    unset i
-}
-
-
-PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
-COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
new file mode 100644
index 0000000..d01efdd
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
@@ -0,0 +1,79 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-qoriq-common_${PV}.inc
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
+PROVIDES += "u-boot"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python-native"
+DEPENDS_append_qoriq-arm64 = " change-file-endianess-native dtc-native tcl-native"
+DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
+DEPENDS_append_qoriq-ppc = " boot-format-native"
+
+python () {
+    if d.getVar("TCMODE", True) == "external-fsl":
+        return
+
+    ml = d.getVar("MULTILIB_VARIANTS", True)
+    arch = d.getVar("OVERRIDES", True)
+
+    if "e5500-64b:" in arch or "e6500-64b:" in arch:
+        if not "lib32" in ml:
+            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-')
+    elif "fsl-lsch2-32b:" in arch:
+        if not "lib64" in ml:
+            raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
+}
+
+LE_UBOOT_FOR_ARMBE_TARGET ?= "0"
+ENDIANNESS_GCC = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-mlittle-endian", "", d)}"
+ENDIANNESS_LD = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-EL", "", d)}"
+
+WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${ENDIANNESS_GCC}" LD="${WRAP_TARGET_PREFIX}ld ${ENDIANNESS_LD}" V=1'
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+
+do_compile_append_qoriq() {
+    unset i j k
+    for config in ${UBOOT_MACHINE}; do
+        i=`expr $i + 1`;
+        for type in ${UBOOT_CONFIG}; do
+            j=`expr $j + 1`;
+            for binary in ${UBOOT_BINARIES}; do
+                k=`expr $k + 1`
+                if [ $j -eq $i ] && [ $k -eq $i ]; then
+                    if [ -n "${BOOTFORMAT_CONFIG}" ] && echo "${type}" |grep -q spi;then
+                        # regenerate spi binary if BOOTFORMAT_CONFIG is set
+                        boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
+                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
+                        cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
+                    elif [ "qspi" = "${type}" ];then
+                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
+                    fi
+                fi
+            done
+            unset k
+        done
+        unset j
+    done
+    unset i
+}
+
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+COMPATIBLE_MACHINE = "(qoriq)"
-- 
2.7.4

[PATCH v2 09/41] cst: update to f599f61

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*Update to lsdk 1812 tag
include the following changes:
f599f61 - Corrects Copyright.
b10fa04 - scripts/platform/LX2160_xspi: Coorect the kernel header location.
e7953a7 - Increases file name array size.
094351b - LX2160: Adds input file and script for signing images using flexbuild.
4eb59af - LS1012ARDB: Change in script file for pfe_fw check
46262e7 - LS1012ARDB: Add input file for pfe header generation
ca26c84 - LS1088 and LS2088: Modify scripts for Secure Boot TF-A
aae5c8e - Modify scripts for Secure Boot TF-A
5e04504 - create_hdr_pbi: Add cmd line options

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-devtools/cst/cst_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb
index acb7241..05d2d4c 100644
--- a/recipes-devtools/cst/cst_git.bb
+++ b/recipes-devtools/cst/cst_git.bb
@@ -11,7 +11,7 @@ inherit kernel-arch
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \
 "
-SRCREV = "3285e1d23a6abe3db6b3673e79acdeed4e19ea95"
+SRCREV = "f599f6126ae1a382a581dcd75e9ad2e34c79a183"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 10/41] dce: update to 49389aa

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*Update to lsdk 1812 tag
include the following changes:
49389aa - .gitmodules: use codeaurora url
0c4eea9 - Makefile and gitmodules update
492eecd - dpdcei: Affine thread for FQDAN setup
b2a48e8 - dce: Support LX2160 SOCs
62af9fe - dce: Userspace dce support for DPAA2 devices

*qbman update to 383ceac
Update to lsdk 1812 tag
include the following changes:
383ceac - Support for the QBMAN 5.0 userspace.

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-dpaa2/dce/dce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb
index 74dc48c..7313ca7 100644
--- a/recipes-dpaa2/dce/dce_git.bb
+++ b/recipes-dpaa2/dce/dce_git.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=338308e2a663929309c9929ab9495bb5"
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \
       git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \
 "
-SRCREV = "8d6dd3286d93f2289e2467401b900378ade24a0f"
-SRCREV_qbman = "75ff61a7ca6acdbdbb780161b053cbcbc990f1be"
+SRCREV = "49389aa57cc94e0503f53c6b33e4b358ccf42eb5"
+SRCREV_qbman = "383ceac0c09b1e38f2a8b1cf42822686b4cf15f3"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 11/41] mc: Upgrade version to 10.12.0

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
cdb5af4 - Add the prebuilt binaries of mc 10.12.0 release
840aa8e - Initial commit to add README

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 .../management-complex_10.10.0.bb                  | 39 ---------------------
 .../management-complex_10.12.0.bb                  | 40 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-dpaa2/management-complex/management-complex_10.10.0.bb
 create mode 100644 recipes-dpaa2/management-complex/management-complex_10.12.0.bb

diff --git a/recipes-dpaa2/management-complex/management-complex_10.10.0.bb b/recipes-dpaa2/management-complex/management-complex_10.10.0.bb
deleted file mode 100644
index 2e02ba1..0000000
--- a/recipes-dpaa2/management-complex/management-complex_10.10.0.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "DPAA2 Management Complex Firmware"
-LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=afcb1213054384820390d410ab62105f"
-
-inherit deploy fsl-eula-unpack
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;fsl-eula=true;nobranch=1"
-SRCREV = "a71009e13b1e7dac9cffc708f62037e67985bbfc"
-
-S = "${WORKDIR}/git"
-
-REGLEX_ls2088a = "ls2088a"
-REGLEX_ls1088a = "ls1088a"
-
-do_install () {
-    install -d ${D}/boot
-    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/mc_app
-    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
-    # make a symlink to the latest binary
-    for mc_binary in `ls ${DEPLOYDIR}/mc_app |sort`;do
-        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
-    done
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2088a|ls1088a)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/recipes-dpaa2/management-complex/management-complex_10.12.0.bb b/recipes-dpaa2/management-complex/management-complex_10.12.0.bb
new file mode 100644
index 0000000..6b5d0a8
--- /dev/null
+++ b/recipes-dpaa2/management-complex/management-complex_10.12.0.bb
@@ -0,0 +1,40 @@
+SUMMARY = "DPAA2 Management Complex Firmware"
+LICENSE = "NXP-Binary-EULA"
+LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=afcb1213054384820390d410ab62105f"
+
+inherit deploy fsl-eula-unpack
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "git://github.com/nxp/qoriq-mc-binary;fsl-eula=true;nobranch=1"
+SRCREV = "cdb5af4b25ec1ee3e9d26ece41efaa1556b28bac"
+
+S = "${WORKDIR}/git"
+
+REGLEX_ls2088a = "ls2088a"
+REGLEX_ls1088a = "ls1088a"
+REGLEX_lx2160a = "lx2160a"
+
+do_install () {
+    install -d ${D}/boot
+    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
+}
+
+do_deploy () {
+    install -d ${DEPLOYDIR}/mc_app
+    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
+    # make a symlink to the latest binary
+    for mc_binary in `ls ${DEPLOYDIR}/mc_app |sort`;do
+        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
+    done
+}
+addtask deploy before do_build after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
-- 
2.7.4

[PATCH v2 12/41] restool: update to 2b4dd21

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
2b4dd21 - dprc: generate-dpl: export only the objects that exist
2c3202b - dpdmux: rename flib_ops
8106ce7 - export flib_ops in the restool header
ea39c04 - dpmac: update interface type enum
c54067a - dpseci: fix 16 queues support
1c2dde0 - dpmac: display counters in info command
40dddfc - scripts: dynamically setup the DPCON objects needed
eb49d17 - scripts: dynamically determine the number of DPIOs needed
2255cab - dpmac: add DPMAC_ETH_IF_CAUI as one of the supported phy types
cbee183 - dpseci: increase the maximum number of queues
ce7d849 - dpni: increase the maximum number of queues

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-dpaa2/restool/restool_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 093582c..382e314 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "bash dtc"
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \
     file://0001-restool-fix-build-error-with-gcc7.patch"
 
-SRCREV = "9815bb661d70c9d66aa71dba62602718b61c7013"
+SRCREV = "2b4dd211d5c584d5f81cfa530a3a93854dc1d490"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 13/41] spc: add recipes

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
1a41424 - License updates
6aa1509 - Fixed Jump/Gosub instruction code
f814f3e - Updated the LX2 Parser revision
d7e3f30 - Set the blob version to 1.0
bd1b667 - Refactoring the makefile and net headers.
12b6a71 - Updates on some RA (Result Array) fields
bf1a132 - Small install updates
f45da58 - Updated Parser revisions according to platform
5799b9f - Parser IP block Rev fix for LS2
4de4651 - Add more validation and error messages and FAF names changed
b8a2630 - Blob version fix
2707f30 - Dump the blob as array of bytes in a header
0eddcd2 - Display some runtime warnings
66c1e1e - Small fix for Ubuntu: include string.h
3b8d002 - Changes around debug layers and intermediate code generation
722ebd9 - Small updates (warning message for unsupported elem and removed base proto from another SP from blob)
f486cba - VxLAN support and Blob protocols ID update
84bf344 - Small HW config file refactory: parser
5f6414c - Small fixes (prevproto type and load in AIOP)
2d37fad - Fixed protocol entry point offset in blob
58da088 - Add support to call from another SP (use: prevproto / nextproto)
9f22e3e - Add support to run SP before HW Parser (use: prevproto='none')
8852fb0 - Added configuration file
46fd66a - Added SP Parameters in Blob Generation
303354c - Added Blob Generation (initial version)
d7efad8 - Memory map update for DPAA2
33af4c3 - HXS PDL update with new protocols
c9e07ee - Fixed checksum calculation
e686771 - Adding RA_GPR1 utility functions
8831a9c - FAF update according to Parser_Block_Guide_03.106
40c8e02 - Refactory the set faf high level xml instruction
8eb61a6 - Added support for FAF and new protocols
21dba55 - Added command to generate intermediate code

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-dpaa2/spc/spc_git.bb | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 recipes-dpaa2/spc/spc_git.bb

diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
new file mode 100644
index 0000000..eceabf9
--- /dev/null
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Soft Parser Configuration tool"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
+
+DEPENDS = "libxml2 fmlib tclap"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/spc;nobranch=1"
+SRCREV = "1a414247ad3228bf60bfb53995a28930a8a29acc"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
+    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+EXTRA_OEMAKE_virtclass-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
+    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+
+EXTRA_OEMAKE_PLATFORM ?= ""
+
+do_compile () {
+    oe_runmake  -C source
+}
+
+do_install () {
+    install -d ${D}/${bindir}
+    install -m 755 ${S}/source/spc ${D}/${bindir}
+
+    install -d ${D}${sysconfdir}/spc/config
+    install -m 644 ${S}${sysconfdir}/spc/config/* ${D}${sysconfdir}/spc/config
+
+}
+
+PARALLEL_MAKE = ""
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.7.4

[PATCH v2 14/41] dpdk: update to f451d2b

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
f451d2b - PVT:dpaa: add ipv6 distribution in fmc xml scripts
c3c6697 - examples/l3fwd: add per port buffer pool support
8232d30 - PVT: bus/fslmc: fix array access in interrupt affinity for LCORE_ID_ANY
c09e3c4 - Merge pull request #824 in GITAM/dpdk from ~NXA19696/dpdk:17.11-qoriq-dev to 17.11-qoriq-dev
6e381aa - bus/fslmc: apply portal to cpu mapping only for non-rx portals
4f3b82f - Merge pull request #822 in GITAM/dpdk from ~NXA19696/dpdk:17.11-qoriq-dev to 17.11-qoriq-dev
58f92eb - bus/fslmc: Reset portal memory before use
7b8d2ee - bus/fslmc: Performance optimization in QBMan Enqueue functionality
2b6f083 - security: fix crash on destroy null session
559e318 - examples/l2fwd-crypto: skip device not supporting operation
df3b0ce - examples/l2fwd-crypto: check return value on IV size check
fe0af02 - examples/l2fwd-crypto: fix digest with AEAD algo
abbda5d - examples/ipsec-secgw: fix bypass rule processing
3f81162 - examples/ipsec-secgw: fix IPv4 checksum at Tx
2ddfbf9 - build: enable ARM NEON flag when __aarch64__ defined
bc5b0b6 - eal/arm64: fix instrinsic for GCC < 4.9
e25189f - eal: fix build with -O1
fa83a50 - table: add dedicated params struct for cuckoo hash
80833dd - net/dpaa2: fix MAC address initialization
84e9838 - PVT: change the map files default to 17.11
afa05d0 - doc: add doc for dpaa2 pmd timestamp api
2871fe5 - net/dpaa2: fix the copyright year due to changes
f78341c - net/dpaa2: fix clang compilation issues
db2dd17 - PVT:dpaa2: change dpsec to 8 by default
5a815c5 - mk: fix cross build
4c9beb5 - Merge pull request #821 in GITAM/dpdk from DPDK-1499-fmcless-pcd to 17.11-qoriq-dev
a077d74 - PVT: misc clang compilation fixes
4626a2d - PVT: net/dpaa: add schema for default pcd

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/dpdk/dpdk_17.11.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/dpdk/dpdk_17.11.bb b/recipes-extended/dpdk/dpdk_17.11.bb
index 12349b5..58558b4 100644
--- a/recipes-extended/dpdk/dpdk_17.11.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobr
     file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
     file://0001-fix-gcc-8-build-error.patch \
 "
-SRCREV = "0c0332ae0016ca6742961f1f4ac6e2f4fdbe215a"
+SRCREV = "f451d2beff458833f4da6682694ebc5c03d595c6"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 15/41] libpkcs11: update to efd15b9

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
efd15b9 - APP: Miscellaneous Changes
4e6b422 - APP: Fix for PLATSEC-723
73a327b - Fixing Compilation warning in app sign_digest_update_final
b2dbe62 - Supported PKCS API C_DigestInit, C_Digest, C_DigestUpdate, C_DigestFinal.
7f58a9b - enable support pkcs api c_signupdate, c_signfinal for mechanism ckm_<digest_mech>_rsa_pkcs
57e1772 - Miscellaneous changes for segmentation faults.
8c931f4 - LIB_APP: Miscellaneous Changes
a6e4ffe - LIB: Adding CKA_PRIVATE attribute for objects.
ab9c41b - LIB: Adding support for C_CreateObject
1b8f665 - APP: Adding Encryption/Decryption support in pkcs11_app
1c002e9 - LIB: Adding support for OAEP Encryption scheme
ce69fe5 - LIB: Adding Support for C_DecryptInit() and C_Decrypt() Function
b7e3c5a - Adding C_GenerateKeyPair, C_DestroyObject function implementation.
6fcfab5 - LIB_APP: Adding CKM_RSA_PKCS_KEY_PAIR_GEN mechanism
8f82b97 - Review rework: Addressing the comments given on Token, Session, Login APIs patch
bab9e71 - LIB: Adding Login and Sessions Functions
ee86c10 - LIB: Adding C_InitToken, C_InitPin, C_SetPin function implementation

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/libpkcs11/libpkcs11_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index e6161c6..2bd941e 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1"
-SRCREV = "e9f570c4464598afea65a227b7e2f37fe6b032fc"
+SRCREV = "efd15b9fb6ecc453eb933ac28ef1741b989f842d"
 
 DEPENDS = "openssl secure-obj"
 
-- 
2.7.4

[PATCH v2 16/41] secure-obj:update to bc0553a

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
bc0553a - removed dead code under compile time flag SK_INVALID_HANDLE
f2fddd6 - added support for sk_digestinit sk_digestupdate sk_digestfinal.
f509695 - APP_TA_LIB: Adding SK_ATTR_PRIVATE attribute for objects
6791873 - SOBJ_LIB: Exposing SK_CreateObject for PKCS#11 Library
f3da9c0 - TA: Miscellaneous Changes
07ef069 - APP_ENG: Adding support for OAEP Encryption in engine and engine app
9fdbf7a - LIB_TA: Adding support for OAEP Encryption Scheme
1652924 - TA: Not returning TEE_ERROR_BAD_PARAMETERS for unmatched attributes
2a49505 - LIB: Exposing SK_GenerateKeyPair and SK_EraseObject Functions

*add secure-obj-module to RDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/secure-obj/secure-obj.inc    | 2 +-
 recipes-extended/secure-obj/secure-obj_git.bb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc
index 99271d1..2034126 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -12,7 +12,7 @@ LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1 \
 "
-SRCREV = "bbcbe6cd137440b8b23e1fa71077fd3c8973e5da"
+SRCREV = "bc0553a3c7a02555eb6bf46803854f6b49227a26"
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index db881b1..d85d729 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
 
 S = "${WORKDIR}/git"
 
+RDEPENDS_{PN}  += "secure-obj-module"
+
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
 export OPTEE_CLIENT_EXPORT = "${RECIPE_SYSROOT}/usr"
-- 
2.7.4

[PATCH v2 17/41] linux-qoriq/4.14:update to

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
7e0006c - Merge branch 'linux-4.14-nxp' into linux-4.14 on Dec 19, 2018
4236178 - dpaa2-eth: Increase Rx FQ taildrop threshold
7ffe13f - arm64: dts: lx2160: Modify the flexspi flash frequency
238edda - arm64: dts: ls1046: Modify the qspi flash frequency
beaaa7f - Merge branch 'linux-4.14-nxp' into linux-4.14 on Dec 18, 2018
69f0f21 - sdk_fman: suspend the FMan to Deep Sleep on PPC only
334cc75 - Merge branch 'linux-4.14-nxp' into linux-4.14 on Dec 14, 2018
e97599c - staging: fsl-dpaa2/mac: connect to the fixed phy
0845a39 - staging: fsl-dpaa2/mac: fix the if_mode type
ce93eb7 - crypto: caam/qi2 - relax busy polling while enqueuing FDs
b160625 - crypto: caam/qi2 - rate-limit enqueue failure prints
27f75fe - crypto: caam/qi2 - use affine DPIOs
d02c9f5 - Merge branch 'linux-4.14-nxp' into linux-4.14 on Dec 13, 2018
63c8fc0 - arm64: dts: Added endianness information to dts serdes node
1d98a2a - arm64: dts: lx2160: DPMAC connections to backplane PHYs example
22c1592 - arm64: dts: lx2160: PCS PHY definitions for 10GBase-KR and 40GBase-KR backplane modes
2001e28 - arm64: dts: lx2160: Add all pcs mdio definitions according to RM
f9b133c - arm64: dts: ls104x: add missing dma ranges property
8e3fb42 - net/phy: xgkr: BaseKR algorithm outcome is printed on linux console
03092ae - net/phy: xgkr: Local/Remote training functions renaming
ec337a2 - net/phy: xgkr: Refactoring on coefficient update
a63b7e8 - net/phy: xgkr: Fixed BaseKR algorithm inconsistent coefficient updates
8a45df4 - bindings/net: Device Tree Bindings for DPAA backplane
fa371c0 - net/phy: xgkr: Removed the unnecessary error message 'No associated device tree node'
fb66780 - net/phy: xgkr: Dual endianness support
6d4884d - net/phy: xgkr: Minor function renaming
529da95 - net/phy: xgkr: Introduced 40G specific init parameters
0a9c718 - net/phy: xgkr: Introduced restart AN feature
fff256b - net/phy: xgkr: Introduced wrapper functions for phy read/write mmd
8383aee - net/phy: xgkr: Added Master Lane specific operations
1f4fb23 - net/phy: xgkr: Add 4-lanes support
e13f335 - net/phy: xgkr: Refactoring on main KR driver implementation

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-kernel/linux/linux-qoriq_4.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-qoriq_4.14.bb b/recipes-kernel/linux/linux-qoriq_4.14.bb
index 13a4463..cb06ae4 100644
--- a/recipes-kernel/linux/linux-qoriq_4.14.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.14.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \
     file://0001-fix-gcc8-build-error.patch \
 "
-SRCREV = "f2f35bbfc16b384f447a30dd0b240637331fd132"
+SRCREV = "7e0006ca696756b867abbeb7a4ed97ffe9caf725"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[PATCH v2 18/41] optee-os-qoriq: update to e93f053

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
e93f053 - Merge pull request #12 in DASH/optee_os from ~NXA18717/optee_os:optee_3.2.0 to optee_3.2.0
40670fe - plat-ls:add LX2160ARDB platform flavors
c4ca171 - Updating MAINTAINERS for NXP LS-RDB Platforms

*support ls1012afrwy 512mb and ls1012afrwy 1G

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-security/optee/optee-os-qoriq_git.bb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/recipes-security/optee/optee-os-qoriq_git.bb b/recipes-security/optee/optee-os-qoriq_git.bb
index 5a68942..c8ebe2b 100644
--- a/recipes-security/optee/optee-os-qoriq_git.bb
+++ b/recipes-security/optee/optee-os-qoriq_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "python-pycrypto-native"
 
 inherit deploy pythonnative
 
-SRCREV = "5f6c95c085bb0dd750a7f5c464e5ebe6de0a99bd"
+SRCREV = "e93f053213c574ec1b97f9e56b2f31692cd3723c"
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_os;nobranch=1 \
            file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
           "
@@ -31,13 +31,21 @@ OPTEE_ARCH_aarch64 = "arm64"
 do_compile() {
     unset LDFLAGS
     oe_runmake all CFG_TEE_TA_LOG_LEVEL=0
+    ${OBJCOPY} -v -O binary ${B}/out/arm-plat-ls/core/tee.elf   ${B}/out/arm-plat-ls/core/tee.bin
+    
+    if [ ${MACHINE} = ls1012afrwy ]; then
+        mv ${B}/out/arm-plat-ls/core/tee.bin  ${B}/out/arm-plat-ls/core/tee_512mb.bin
+        oe_runmake CFG_DRAM0_SIZE=0x40000000 all CFG_TEE_TA_LOG_LEVEL=0
+        ${OBJCOPY} -v -O binary ${B}/out/arm-plat-ls/core/tee.elf   ${B}/out/arm-plat-ls/core/tee.bin
+    fi
 }
 
 do_install() {
     #install core on boot directory
     install -d ${D}/lib/firmware/
-
-    ${OBJCOPY} -v -O binary ${B}/out/arm-plat-ls/core/tee.elf   ${B}/out/arm-plat-ls/core/tee.bin
+    if [ ${MACHINE} = ls1012afrwy ]; then
+        install -m 644 ${B}/out/arm-plat-ls/core/tee_512mb.bin ${D}/lib/firmware/tee_${MACHINE}_512mb.bin
+    fi
     install -m 644 ${B}/out/arm-plat-ls/core/tee.bin ${D}/lib/firmware/tee_${MACHINE}.bin
     #install TA devkit
     install -d ${D}/usr/include/optee/export-user_ta/
@@ -52,7 +60,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 do_deploy() {
         install -d ${DEPLOYDIR}/optee
         for f in ${D}/lib/firmware/*; do
-            install -m 644 $f ${DEPLOYDIR}/optee/tee_${MACHINE}.bin
+            cp $f ${DEPLOYDIR}/optee/
         done
 }
 
-- 
2.7.4

[PATCH v2 19/41] ddr-phy: add recipes

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
14d03e6 - Add fip file for DDR binaries for TF-A flow
241bedb - lx2: ddr: phy: add rdimm phy binaries.
2cb8757 - lx2: ddr: phy: add udimm phy binaries.
4081187 - Initial Commit

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/ddr-phy/ddr-phy_git.bb | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 recipes-bsp/ddr-phy/ddr-phy_git.bb

diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
new file mode 100644
index 0000000..ebd68c2
--- /dev/null
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -0,0 +1,29 @@
+SUMMARY = "DDR firmware repository"
+LICENSE = "NXP-Binary-EULA"
+LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=89cc852481956e861228286ac7430d74"
+
+inherit deploy fsl-eula-unpack
+
+SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;fsl-eula=true;nobranch=1"
+SRCREV = "14d03e6e748ed5ebb9440f264bb374f1280b061c"
+
+S = "${WORKDIR}/git"
+
+REGLEX_lx2160a = "lx2160a"
+
+do_install () {
+    install -d ${D}/boot
+    install -m 755 ${S}/${REGLEX}/* ${D}/boot
+}
+
+do_deploy () {
+    install -d ${DEPLOYDIR}/ddr-phy
+    install -m 755 ${S}/${REGLEX}/* ${DEPLOYDIR}/ddr-phy
+}
+addtask deploy before do_populate_sysroot after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"
+
+COMPATIBLE_MACHINE = "(lx2160a)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
2.7.4

[PATCH v2 20/41] vpp: add recipes

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1812 tag
include the following changes
d3111f0 - Merge pull request #28 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
3de6197 - Fixed build failure issue.
850f7b0 - Merge pull request #27 in DQNS/vpp from ~NXA12342/vpp:18.01 to 18.01
bb942a3 - dpdk/ipsec: add locks on session data hash updates
2e647f4 - Merge pull request #26 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
f242992 - PVT: ipsec: Fixed capability matching for openssl based sha1 authentication
d7133de - Adding copyright for IPsec protocol offload work
a0a8384 - Fixed copyright issue
8ac7782 - Fixed Debian pkg errors with Ubuntu 18.04
99f3b56 - Address compilation issues with Java > 1.8
09ba9a8 - Introducing env variables to include non-standard include in libs paths
9a24604 - glibc 2.27 fix
25c590a - Optimizing Crypto Dequeue Node to prevent buffer losses
d8409f4 - Merge branch '18.01' of ssh://bitbucket.sw.nxp.com/~nxa19696/vpp into 18.01
731a2e5 - Added option for enabling RSS
3a97655 - Merge pull request #19 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
e47fe7d - Enable use of Maximum QP in Sec Device when available
723d633 - Merge pull request #18 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
a99e163 - PVT:dpdk_plugin: introducing IPSec protocol offload support
5f9b2c1 - Fixed Port detection mechanism for DPAA platforms
f5724cd - Fixed debian pkg support for ARM64 platforms
29755c5 - Upstreamed: Fix to start Crypto Dev
351b6fd - Added support for Single CPU usecase with events
49ddf3b - ipsec: workaround for crypto devices having single queue
d6adb7d - Tune config file for caam_jr driver
b4a490c - Adjusting number of buffers for LS1012
ee5b872 - Merge pull request #13 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
b40602f - Merge branch '18.01' of ssh://bitbucket.sw.nxp.com/~nxa19696/vpp into 18.01
d8edb01 - Introduced Check for Heap allocation failure
7c551f6 - Merge pull request #12 in DQNS/vpp from ~NXA19696/vpp:18.01 to 18.01
43bef3e - Tuning Memory requirements for LS1012
ff02d6e - README_nxp updated
984ef5b - Adjusting Socket Memory requiremets

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 ....4-fails-when-we-specify-arch-funattribut.patch |  26 +++
 ...pi-with-shared-libs-if-static-is-disabled.patch |  28 +++
 recipes-extended/vpp-core/files/config.h           |   1 +
 recipes-extended/vpp-core/vpp-core.bb              |  62 ++++++
 recipes-extended/vpp-core/vpp-pkgs.inc             | 227 +++++++++++++++++++++
 5 files changed, 344 insertions(+)
 create mode 100644 recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
 create mode 100644 recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch
 create mode 100644 recipes-extended/vpp-core/files/config.h
 create mode 100644 recipes-extended/vpp-core/vpp-core.bb
 create mode 100644 recipes-extended/vpp-core/vpp-pkgs.inc

diff --git a/recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch b/recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
new file mode 100644
index 0000000..7f83847
--- /dev/null
+++ b/recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
@@ -0,0 +1,26 @@
+From 6dab3ad3f91ebcdb16eb9bbb37383718793b675a Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Sat, 29 Sep 2018 09:57:05 -0700
+Subject: [PATCH] GCC above 5.4 fails when we specify arch funattribute.
+
+Here we are as a workaround setting target.
+---
+ src/vppinfra/cpu.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
+index 110815c..618276c 100644
+--- a/src/vppinfra/cpu.h
++++ b/src/vppinfra/cpu.h
+@@ -27,7 +27,7 @@
+ 
+ #if __x86_64__ && CLIB_DEBUG == 0
+ #define foreach_march_variant(macro, x) \
+-  macro(avx2,  x, "arch=core-avx2")
++  macro(avx2,  x, "avx2")
+ #else
+ #define foreach_march_variant(macro, x)
+ #endif
+-- 
+2.7.4
+
diff --git a/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch b/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch
new file mode 100644
index 0000000..ae1c9cb
--- /dev/null
+++ b/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch
@@ -0,0 +1,28 @@
+From 7005c075cab39c8018d224c2fe56ad2e4f2db340 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Tue, 11 Sep 2018 14:08:51 -0700
+Subject: [PATCH] Link vpp-api with shared libs if static is disabled
+
+TODO: this is not complete
+---
+ src/vpp-api.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vpp-api.am b/src/vpp-api.am
+index 553eafa..30dfe9d 100644
+--- a/src/vpp-api.am
++++ b/src/vpp-api.am
+@@ -23,8 +23,8 @@ libvppapiclient_la_LIBADD = \
+   -lpthread -lm -lrt
+ 
+ libvppapiclient_la_LDFLAGS = \
+-  -Wl,-L$(top_builddir)/.libs,--whole-archive,-l:libsvm.a,-l:libvppinfra.a,-l:libvlibmemoryclient.a,--no-whole-archive \
+-  -Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt
++  -L$(top_builddir)/.libs -lsvm -lvppinfra -lvlibmemoryclient  \
++	-Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt
+ 
+ libvppapiclient_la_DEPENDENCIES = libvppinfra.la libvlibmemoryclient.la libsvm.la
+ 
+-- 
+2.7.4
+
diff --git a/recipes-extended/vpp-core/files/config.h b/recipes-extended/vpp-core/files/config.h
new file mode 100644
index 0000000..2d61761
--- /dev/null
+++ b/recipes-extended/vpp-core/files/config.h
@@ -0,0 +1 @@
+#define __PRE_DATA_SIZE 128
diff --git a/recipes-extended/vpp-core/vpp-core.bb b/recipes-extended/vpp-core/vpp-core.bb
new file mode 100644
index 0000000..173d2df
--- /dev/null
+++ b/recipes-extended/vpp-core/vpp-core.bb
@@ -0,0 +1,62 @@
+DESCRIPTION = "Vector Packet Processing"
+
+S = "${WORKDIR}/git"
+PV = "18.01"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
+
+AUTOTOOLS_SCRIPT_PATH = "${S}/src"
+
+SRCREV = "d3111f07682585079069b91666afffbc73c79cd8"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/vpp;nobranch=1 \
+	file://0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch \
+	file://0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch \
+        file://config.h \
+	"
+DEPENDS = "dpdk openssl numactl bison-native vpp-core-native"
+DEPENDS_class-native = "bison-native openssl-native"
+
+inherit autotools
+inherit pkgconfig
+inherit python-dir
+
+export ARCH="arm64"
+
+EXTRA_OECONF = " \
+	--disable-dependency-tracking \
+	--with-libtool-sysroot=${SYSROOT} \
+	--srcdir=${S}/src \
+	--enable-perftool \
+	--disable-papi \
+	--disable-japi \
+	--disable-static \
+        --with-pre-data=128 \
+        --disable-flowprobe-plugin --disable-ixge-plugin \
+        --disable-memif-plugin --disable-sixrd-plugin --disable-gtpu-plugin \
+        --disable-ioam-plugin --disable-lb-plugin --disable-ila-plugin \
+        --disable-nat-plugin --disable-l2e-plugin --disable-stn-plugin \
+        --disable-pppoe-plugin --disable-kubeproxy-plugin \
+        --disable-vom   --disable-dpdk-plugin \
+"
+
+EXTRA_OECONF_append_class-native = " --disable-vlib"
+
+
+include vpp-pkgs.inc
+
+
+do_configure_append () {
+	( cd ${B} &&  mkdir -p vppinfra vpp/app )
+          cp ${WORKDIR}/config.h ${S}/src/vlib/config.h 
+}
+
+do_install_append() {
+	mkdir -p ${D}/etc/vpp
+	cp ${S}/src/vpp/conf/startup.conf ${D}/etc/vpp/startup.conf
+}
+
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-extended/vpp-core/vpp-pkgs.inc b/recipes-extended/vpp-core/vpp-pkgs.inc
new file mode 100644
index 0000000..0dc7609
--- /dev/null
+++ b/recipes-extended/vpp-core/vpp-pkgs.inc
@@ -0,0 +1,227 @@
+
+PACKAGES += "vpp-core-data vpp-core-plugin-igmp vpp-core-plugin-gtpu vpp-core-plugin-gbp \
+		vpp-core-plugin-lb vpp-core-plugin-avf vpp-core-plugin-cdp vpp-core-plugin-map vpp-core-plugin-srv6as \
+		vpp-core-plugin-l2e vpp-core-plugin-acl vpp-core-plugin-flowprobe vpp-core-plugin-abf \
+		vpp-core-plugin-pppoe vpp-core-plugin-lacp vpp-core-plugin-ioam vpp-core-plugin-memif \
+		vpp-core-plugin-stn vpp-core-plugin-srv6ad vpp-core-plugin-mactime vpp-core-plugin-unittest \
+		vpp-core-plugin-nat vpp-core-plugin-srv6am vpp-core-plugin-lb_test \
+		vpp-core-plugin-ioam_vxlan_gpe_test vpp-core-plugin-map_test vpp-core-plugin-avf_test \
+		vpp-core-plugin-mactime_test vpp-core-plugin-udp_ping_test vpp-core-plugin-ioam_trace_test \
+		vpp-core-plugin-lacp_test vpp-core-plugin-stn_test vpp-core-plugin-memif_test \
+		vpp-core-plugin-nat_test vpp-core-plugin-acl_test vpp-core-plugin-ioam_export_test \
+		vpp-core-plugin-flowprobe_test vpp-core-plugin-ioam_pot_test \
+		vpp-core-plugin-vxlan_gpe_ioam_export_test  vpp-core-plugin-pppoe_test vpp-core-plugin-gtpu_test \
+		vpp-core-plugin-cdp_test vpp-core-plugin-dpdk vpp-core-plugin-dpdk_test vpp-core-test \
+		vpp-core-plugin-tlsopenssl vpp-core-plugin-ixge vpp-core-plugin-ila vpp-core-plugin-data \
+		"
+
+#vpp-core-python 
+#FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} \
+#	          ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/requires.txt \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/PKG-INFO \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/top_level.txt \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/dependency_links.txt \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/zip-safe \
+#		  ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/SOURCES.txt \
+#			"
+
+FILES_${PN}-test = " ${bindir}/vpp_json_test "
+FILES_${PN}-plugin-igmp = " ${libdir}/vpp_plugins/igmp_plugin.so "
+FILES_${PN}-plugin-gtpu = "  ${libdir}/vpp_plugins/gtpu_plugin.so "
+FILES_${PN}-plugin-gbp = " ${libdir}/vpp_plugins/gbp_plugin.so "
+FILES_${PN}-plugin-lb = " ${libdir}/vpp_plugins/lb_plugin.so "
+FILES_${PN}-plugin-avf = "  ${libdir}/vpp_plugins/avf_plugin.so "
+FILES_${PN}-plugin-cdp = "  ${libdir}/vpp_plugins/cdp_plugin.so "
+FILES_${PN}-plugin-map = "  ${libdir}/vpp_plugins/map_plugin.so "
+FILES_${PN}-plugin-srv6as = "  ${libdir}/vpp_plugins/srv6as_plugin.so "
+FILES_${PN}-plugin-tlsopenssl = "  ${libdir}/vpp_plugins/tlsopenssl_plugin.so "
+FILES_${PN}-plugin-ixge = "  ${libdir}/vpp_plugins/ixge_plugin.so "
+FILES_${PN}-plugin-l2e = "  ${libdir}/vpp_plugins/l2e_plugin.so "
+FILES_${PN}-plugin-acl = "  ${libdir}/vpp_plugins/acl_plugin.so "
+FILES_${PN}-plugin-flowprobe = "  ${libdir}/vpp_plugins/flowprobe_plugin.so "
+FILES_${PN}-plugin-abf = "  ${libdir}/vpp_plugins/abf_plugin.so "
+FILES_${PN}-plugin-pppoe = "  ${libdir}/vpp_plugins/pppoe_plugin.so "
+FILES_${PN}-plugin-lacp = "  ${libdir}/vpp_plugins/lacp_plugin.so "
+FILES_${PN}-plugin-ioam = "  ${libdir}/vpp_plugins/ioam_plugin.so "
+FILES_${PN}-plugin-memif = "  ${libdir}/vpp_plugins/memif_plugin.so "
+FILES_${PN}-plugin-stn = "  ${libdir}/vpp_plugins/stn_plugin.so "
+FILES_${PN}-plugin-srv6ad = "  ${libdir}/vpp_plugins/srv6ad_plugin.so "
+FILES_${PN}-plugin-mactime = "  ${libdir}/vpp_plugins/mactime_plugin.so "
+FILES_${PN}-plugin-unittest = "  ${libdir}/vpp_plugins/unittest_plugin.so "
+FILES_${PN}-plugin-nat = "  ${libdir}/vpp_plugins/nat_plugin.so "
+FILES_${PN}-plugin-srv6am = "  ${libdir}/vpp_plugins/srv6am_plugin.so "
+FILES_${PN}-plugin-dpdk = "  ${libdir}/vpp_plugins/dpdk_plugin.so "
+FILES_${PN}-plugin-ila = "  ${libdir}/vpp_plugins/ila_plugin.so "
+
+FILES_${PN}-plugin-lb_test = "  ${libdir}/vpp_api_test_plugins/lb_test_plugin.so "
+FILES_${PN}-plugin-ioam_vxlan_gpe_test = "  ${libdir}/vpp_api_test_plugins/ioam_vxlan_gpe_test_plugin.so "
+FILES_${PN}-plugin-map_test = "  ${libdir}/vpp_api_test_plugins/map_test_plugin.so "
+FILES_${PN}-plugin-avf_test = "  ${libdir}/vpp_api_test_plugins/avf_test_plugin.so "
+FILES_${PN}-plugin-mactime_test = "  ${libdir}/vpp_api_test_plugins/mactime_test_plugin.so "
+FILES_${PN}-plugin-udp_ping_test = "  ${libdir}/vpp_api_test_plugins/udp_ping_test_plugin.so "
+FILES_${PN}-plugin-ioam_trace_test = "  ${libdir}/vpp_api_test_plugins/ioam_trace_test_plugin.so "
+FILES_${PN}-plugin-lacp_test = "  ${libdir}/vpp_api_test_plugins/lacp_test_plugin.so "
+FILES_${PN}-plugin-stn_test = "  ${libdir}/vpp_api_test_plugins/stn_test_plugin.so "
+FILES_${PN}-plugin-memif_test = "  ${libdir}/vpp_api_test_plugins/memif_test_plugin.so "
+FILES_${PN}-plugin-nat_test = "  ${libdir}/vpp_api_test_plugins/nat_test_plugin.so "
+FILES_${PN}-plugin-acl_test = "  ${libdir}/vpp_api_test_plugins/acl_test_plugin.so "
+FILES_${PN}-plugin-ioam_export_test = "  ${libdir}/vpp_api_test_plugins/ioam_export_test_plugin.so "
+FILES_${PN}-plugin-flowprobe_test = "  ${libdir}/vpp_api_test_plugins/flowprobe_test_plugin.so "
+FILES_${PN}-plugin-ioam_pot_test = "  ${libdir}/vpp_api_test_plugins/ioam_pot_test_plugin.so "
+FILES_${PN}-plugin-vxlan_gpe_ioam_export_test = "  ${libdir}/vpp_api_test_plugins/vxlan_gpe_ioam_export_test_plugin.so "
+FILES_${PN}-plugin-pppoe_test = "  ${libdir}/vpp_api_test_plugins/pppoe_test_plugin.so "
+FILES_${PN}-plugin-gtpu_test = "  ${libdir}/vpp_api_test_plugins/gtpu_test_plugin.so "
+FILES_${PN}-plugin-cdp_test = "  ${libdir}/vpp_api_test_plugins/cdp_test_plugin.so "
+FILES_${PN}-plugin-dpdk_test = "  ${libdir}/vpp_api_test_plugins/dpdk_test_plugin.so "
+
+FILES_${PN}-data = " \
+		${datadir}/vpp/api/core/sctp.api.json \
+		${datadir}/vpp/api/core/sr.api.json \
+		${datadir}/vpp/api/core/gre.api.json \
+		${datadir}/vpp/api/core/lisp.api.json \
+		${datadir}/vpp/api/core/netmap.api.json \
+		${datadir}/vpp/api/core/tcp.api.json \
+		${datadir}/vpp/api/core/ipsec_gre.api.json \
+		${datadir}/vpp/api/core/bfd.api.json \
+		${datadir}/vpp/api/core/tap.api.json \
+		${datadir}/vpp/api/core/oam.api.json \
+		${datadir}/vpp/api/core/vpe.api.json \
+		${datadir}/vpp/api/core/bier.api.json \
+		${datadir}/vpp/api/core/ipsec.api.json \
+		${datadir}/vpp/api/core/af_packet.api.json \
+		${datadir}/vpp/api/core/vxlan_gpe.api.json \
+		${datadir}/vpp/api/core/session.api.json \
+		${datadir}/vpp/api/core/one.api.json \
+		${datadir}/vpp/api/core/sr_mpls.api.json \
+		${datadir}/vpp/api/core/feature.api.json \
+		${datadir}/vpp/api/core/p2p_ethernet.api.json \
+		${datadir}/vpp/api/core/memclnt.api.json \
+		${datadir}/vpp/api/core/pg.api.json \
+		${datadir}/vpp/api/core/l2.api.json \
+		${datadir}/vpp/api/core/punt.api.json \
+		${datadir}/vpp/api/core/classify.api.json \
+		${datadir}/vpp/api/core/policer.api.json \
+		${datadir}/vpp/api/core/span.api.json \
+		${datadir}/vpp/api/core/udp.api.json \
+		${datadir}/vpp/api/core/vxlan.api.json \
+		${datadir}/vpp/api/core/mpls.api.json \
+		${datadir}/vpp/api/core/qos.api.json \
+		${datadir}/vpp/api/core/ip.api.json \
+		${datadir}/vpp/api/core/ipip.api.json \
+		${datadir}/vpp/api/core/bond.api.json \
+		${datadir}/vpp/api/core/dns.api.json \
+		${datadir}/vpp/api/core/tapv2.api.json \
+		${datadir}/vpp/api/core/pipe.api.json \
+		${datadir}/vpp/api/core/dhcp6_pd_client_cp.api.json \
+		${datadir}/vpp/api/core/l2tp.api.json \
+		${datadir}/vpp/api/core/lisp_gpe.api.json \
+		${datadir}/vpp/api/core/cop.api.json \
+		${datadir}/vpp/api/core/geneve.api.json \
+		${datadir}/vpp/api/core/stats.api.json \
+		${datadir}/vpp/api/core/rd_cp.api.json \
+		${datadir}/vpp/api/core/dhcp.api.json \
+		${datadir}/vpp/api/core/lldp.api.json \
+		${datadir}/vpp/api/core/dhcp6_ia_na_client_cp.api.json \
+		${datadir}/vpp/api/core/ipfix_export.api.json \
+		${datadir}/vpp/api/core/vhost_user.api.json \
+		${datadir}/vpp/api/core/interface.api.json \
+		${datadir}/vpp/C.py \
+                ${datadir}/vpp/api/core/flow.api.json \
+                ${datadir}/vpp/api/core/map.api.json  \
+                ${datadir}/vpp/api/core/dpdk.api.json \
+		${datadir}/vpp/JSON.py "
+
+
+FILES_${PN} = " \
+		${sysconfdir}/vpp \
+		${sysconfdir}/vpp/startup.conf \
+		${sysconfdir}/vpp/startup.conf.dflt \
+		${sysconfdir}/rc.local \
+		${bindir}/svmdbtool \
+		${bindir}/svmtool \
+		${bindir}/vppapigen \
+		${bindir}/elftool \
+		${bindir}/cpelatency \
+		${bindir}/cpelinreg \
+		${bindir}/elog_merge \
+		${bindir}/c2cpel  \
+		${bindir}/cpelstate  \
+		${bindir}/cpeldump \
+		${bindir}/vpp \
+		${bindir}/vpp_api_test \
+		${bindir}/vpp_get_metrics \
+		${bindir}/vpp_restart \
+		${bindir}/vppctl \
+		${libdir}/libcperf.so.0.0.0 \
+		${libdir}/libcperf.so.0 \
+		${libdir}/libsvm.so.0 \
+		${libdir}/libsvm.so.0.0.0 \
+		${libdir}/libsvmdb.so.0 \
+		${libdir}/libsvmdb.so.0.0.0 \
+		${libdir}/libvapiclient.so.0 \
+		${libdir}/libvapiclient.so.0.0.0 \
+		${libdir}/libvatplugin.so.0 \
+		${libdir}/libvatplugin.so.0.0.0 \
+		${libdir}/libvcl_ldpreload.so.0 \
+		${libdir}/libvcl_ldpreload.so.0.0.0 \
+		${libdir}/libvlib.so.0 \
+		${libdir}/libvlib.so.0.0.0 \
+		${libdir}/libvlibmemory.so.0 \
+		${libdir}/libvlibmemory.so.0.0.0 \
+		${libdir}/libvlibmemoryclient.so.0 \
+		${libdir}/libvlibmemoryclient.so.0.0.0 \
+		${libdir}/libvnet.so.0 \
+		${libdir}/libvnet.so.0.0.0 \
+		${libdir}/libvppapiclient.so.0 \
+		${libdir}/libvppapiclient.so.0.0.0 \
+		${libdir}/libvppcom.so.0 \
+		${libdir}/libvppcom.so.0.0.0 \
+		${libdir}/libvppinfra.so.0 \
+		${libdir}/libvppinfra.so.0.0.0 \
+		"
+
+FILES_${PN}-plugin-data = " \
+		${datadir}/vpp/api/plugins/pot.api.json \
+		${datadir}/vpp/api/plugins/pppoe.api.json \
+		${datadir}/vpp/api/plugins/igmp.api.json \
+		${datadir}/vpp/api/plugins/avf.api.json \
+		${datadir}/vpp/api/plugins/mactime.api.json \
+		${datadir}/vpp/api/plugins/gbp.api.json \
+		${datadir}/vpp/api/plugins/map.api.json \
+		${datadir}/vpp/api/plugins/udp_ping.api.json \
+		${datadir}/vpp/api/plugins/l2e.api.json \
+		${datadir}/vpp/api/plugins/ioam_export.api.json \
+		${datadir}/vpp/api/plugins/lb.api.json \
+		${datadir}/vpp/api/plugins/vxlan_gpe_ioam_export.api.json \
+		${datadir}/vpp/api/plugins/ioam_vxlan_gpe.api.json \
+		${datadir}/vpp/api/plugins/acl.api.json \
+		${datadir}/vpp/api/plugins/ioam_cache.api.json \
+		${datadir}/vpp/api/plugins/stn.api.json \
+		${datadir}/vpp/api/plugins/abf.api.json \
+		${datadir}/vpp/api/plugins/nat.api.json \
+		${datadir}/vpp/api/plugins/flowprobe.api.json \
+		${datadir}/vpp/api/plugins/memif.api.json \
+		${datadir}/vpp/api/plugins/lacp.api.json \
+		${datadir}/vpp/api/plugins/gtpu.api.json \
+		${datadir}/vpp/api/plugins/trace.api.json \
+		${datadir}/vpp/api/plugins/dpdk.api.json \
+		${datadir}/vpp/api/plugins/cdp.api.json "
+
+FILES_${PN}-dev = " \
+		${includedir}/* \
+		${libdir}/libvcl_ldpreload.so \
+		${libdir}/libvppapiclient.so \
+		${libdir}/libvppcom.so \
+		${libdir}/libvlib.so \
+		${libdir}/libsvm.so \
+		${libdir}/libsvmdb.so \
+		${libdir}/libvatplugin.so \
+		${libdir}/libvlibmemory.so \
+		${libdir}/libvapiclient.so \
+		${libdir}/libvnet.so \
+		${libdir}/libvppinfra.so \
+		${libdir}/libcperf.so \
+		${libdir}/libvlibmemoryclient.so "
+
-- 
2.7.4

[PATCH v2 21/41] ls1012afrwy: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add RCWQSPI var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1012afrwy.conf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index f43f069..bd154ac 100644
--- a/conf/machine/ls1012afrwy.conf
+++ b/conf/machine/ls1012afrwy.conf
@@ -16,12 +16,14 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "qspi-secure-boot qspi"
-UBOOT_CONFIG[qspi] = "ls1012afrwy_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi-secure-boot] = "ls1012afrwy_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+RCWQSPI ?= "N_SSNP_3305/rcw_1000_default.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw"
+EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 22/41] ls1012afrdm: remove machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*ls1012afrdm and ls1012afrdm-32b will not be supported.

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1012afrdm-32b.conf | 33 ---------------------------------
 conf/machine/ls1012afrdm.conf     | 26 --------------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 conf/machine/ls1012afrdm-32b.conf
 delete mode 100644 conf/machine/ls1012afrdm.conf

diff --git a/conf/machine/ls1012afrdm-32b.conf b/conf/machine/ls1012afrdm-32b.conf
deleted file mode 100644
index 90e4f88..0000000
--- a/conf/machine/ls1012afrdm-32b.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: NXP LS1012AFRDM board
-#@SOC: LSCH2
-#@DESCRIPTION: Machine configuration for NXP QorIQ LS1012ARDB
-#              with ARM Cortext-A53 core
-#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com>
-
-MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1012a:"
-
-require conf/machine/include/qoriq-arm.inc
-require conf/machine/include/arm/arch-arm64.inc
-
-DEFAULTTUNE = "armv7ahf-neon"
-
-KERNEL_CLASSES  = " kernel-fitimage "
-KERNEL_IMAGETYPES = "fitImage"
-
-UBOOT_DTB_LOADADDRESS = "0x90000000"
-UBOOT_ENTRYPOINT = "0x80008000"
-
-UBOOT_CONFIG ??= "qspi"
-UBOOT_CONFIG[qspi] = "ls1012afrdm_qspi_defconfig,,u-boot-dtb.bin"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frdm.dtb"
-KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
-
-EXTRA_IMAGEDEPENDS += "ppa rcw"
-USE_VT = "0"
-
-require conf/multilib.conf
-MULTILIBS ?= "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64"
diff --git a/conf/machine/ls1012afrdm.conf b/conf/machine/ls1012afrdm.conf
deleted file mode 100644
index c0f0d35..0000000
--- a/conf/machine/ls1012afrdm.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: NXP LS1012AFRDM board
-#@SOC: LSCH2
-#@DESCRIPTION: Machine configuration for NXP QorIQ LS1012ARDB
-#              with ARM Cortext-A53 core
-#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com>
-
-MACHINEOVERRIDES =. "fsl-lsch2:ls1012a:"
-
-require conf/machine/include/qoriq-arm64.inc
-require conf/machine/include/arm/arch-arm64.inc
-
-KERNEL_CLASSES  = " kernel-fitimage "
-KERNEL_IMAGETYPES = "fitImage"
-
-UBOOT_DTB_LOADADDRESS = "0x90000000"
-UBOOT_ENTRYPOINT = "0x80080000"
-
-UBOOT_CONFIG ??= "qspi"
-UBOOT_CONFIG[qspi] = "ls1012afrdm_qspi_defconfig,,u-boot-dtb.bin"
-
-KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frdm.dtb"
-KERNEL_DEFCONFIG ?= "defconfig"
-
-EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw"
-USE_VT = "0"
-- 
2.7.4

[PATCH v2 23/41] ls1012ardb:update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add RCWQSPI var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1012ardb.conf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index bd86de4..f05507d 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -16,12 +16,14 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "qspi-secure-boot qspi"
-UBOOT_CONFIG[qspi] = "ls1012ardb_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi-secure-boot] = "ls1012ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+RCWQSPI ?= "R_SPNH_3508/rcw_1000_default.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppa-optee ppfe-firmware rcw"
+EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 24/41] ls1043ardb: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add UEFI_NORBOOT,RCWNOR,RCWSD and RCWNAND var

*remove ppa

*add atf to EXTRA_IMAGEDEPEND

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1043ardb.conf | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index d6e4f59..f9b0d3d 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -16,21 +16,18 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "nand sdcard secure-boot nand-dtb-secure-boot nand-spl-secure-boot nand-secure-boot sdcard-dtb-secure-boot sdcard-spl-secure-boot sdcard-secure-boot nor"
-UBOOT_CONFIG[nor] = "ls1043ardb_config,,u-boot-dtb.bin"
-UBOOT_CONFIG[nand] = "ls1043ardb_nand_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard] = "ls1043ardb_sdcard_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "ls1043ardb_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[nand-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[nand-spl-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin"
-UBOOT_CONFIG[nand-dtb-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[sdcard-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin"
-UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
+UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd"
+RCWNOR ?= "RR_FQPP_1455/rcw_1600.bin"
+RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot.bin"
+RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot.bin"
+
 QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin"
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa ppa-optee qe-ucode uefi"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 25/41] ls1046ardb: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add UEFI_NORBOOT,RCWQSPI and RCWSD var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1046ardb.conf | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 8412313..83309c9 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -15,14 +15,9 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "emmc sdcard sdcard-dtb-secure-boot sdcard-spl-secure-boot sdcard-secure-boot qspi-secure-boot qspi"
-UBOOT_CONFIG[emmc] = "ls1046ardb_emmc_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard] = "ls1046ardb_sdcard_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[qspi] = "ls1046ardb_qspi_config,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi-secure-boot] = "ls1046ardb_qspi_SECURE_BOOT_config,,u-boot-dtb.bin"
-UBOOT_CONFIG[sdcard-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin"
-UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-rdb-sdk.dtb \
@@ -33,5 +28,9 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa ppa-optee uefi"
+UEFI_NORBOOT ?= "LS1046ARDB_EFI_NORBOOT.fd"
+RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin"
+RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 26/41] ls2088ardb: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add UEFI_NORBOOT,RCWQSPI and RCWNOR var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls2088ardb.conf | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index fdd9bf0..04f3bbd 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -15,11 +15,13 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "qspi-secure-boot qspi nand nor"
-UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[nand] = "ls2080ardb_nand_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi] = "ls2088ardb_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi-secure-boot] = "ls2088ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+RCWNOR ?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin"
+RCWQSPI?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_2000_qspi.bin"
+UEFI_NORBOOT ?= "LS2088ARDB_EFI_NORBOOT.fd"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls2088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
@@ -27,5 +29,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex ppa uefi"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex uefi atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 27/41] ls1088ardb: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add RCWQSPI and RCWSD var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1088ardb.conf | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index d15e57b..13c8bf2 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -15,10 +15,9 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "secure-boot sdcard-qspi qspi"
-UBOOT_CONFIG[secure-boot] = "ls1088ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi] = "ls1088ardb_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[sdcard-qspi] = "ls1088ardb_sdcard_qspi_defconfig,,u-boot-with-spl.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
@@ -26,5 +25,8 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
+RCWSD ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd.bin"
+RCWQSPI ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin"
+
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 28/41] ls1088ardb-pb: update machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*update UBOOT_CONFIG

*add RCWQSPI and RCWSD var

*remove ppa

*add atf to EXTRA_IMAGEDEPENDS

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1088ardb-pb.conf | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf
index 0dca364..3726efa 100644
--- a/conf/machine/ls1088ardb-pb.conf
+++ b/conf/machine/ls1088ardb-pb.conf
@@ -15,11 +15,9 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "qspi-secure-boot sdcard-qspi-secure-boot sdcard-qspi qspi"
-UBOOT_CONFIG[qspi-secure-boot] = "ls1088ardb_pb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi] = "ls1088ardb_pb_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[sdcard-qspi] = "ls1088ardb_pb_sdcard_qspi_defconfig,,u-boot-with-spl.bin"
-UBOOT_CONFIG[sdcard-qspi-secure-boot] = "ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig,,u-boot-with-spl.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
@@ -27,5 +25,9 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
+RCWSD ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_sd.bin"
+RCWQSPI ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_qspi.bin"
+
+
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 29/41] lx2160ardb: add machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/lx2160ardb.conf | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 conf/machine/lx2160ardb.conf

diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
new file mode 100644
index 0000000..44eba5d
--- /dev/null
+++ b/conf/machine/lx2160ardb.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: NXP LX2160ARDB
+#@SOC: LSCH3
+#@DESCRIPTION: Machine configuration for running LX2160ARDB in 64-bit mode
+#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com>
+
+require conf/machine/include/qoriq-arm64.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:"
+
+KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_IMAGETYPES = "fitImage"
+
+DTB_LOAD = "0x90000000"
+UBOOT_ENTRYPOINT = "0x80080000"
+
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+KERNEL_DEVICETREE ?= "freescale/fsl-lx2160a-rdb.dtb"
+KERNEL_DEFCONFIG ?= "defconfig"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+UEFI_XSPIBOOT ?= "LX2160ARDB_EFI_NORBOOT.fd"
+RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2.bin"
+RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2_sd.bin"
+
+EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi atf inphi"
+USE_VT = "0"
-- 
2.7.4

[PATCH v2 30/41] libpkcs11: set COMPATIBLE_MACHINE as qoriq-arm64

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/libpkcs11/libpkcs11_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 2bd941e..2a579c7 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -34,4 +34,4 @@ do_install(){
 PARALLEL_MAKE = ""
 INSANE_SKIP_${PN} = "ldflags dev-deps"
 INSANE_SKIP_${PN}-dev = "ldflags dev-elf"
-COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.7.4

[PATCH v2 31/41] pktgen-dpdk: set COMPATIBLE_MACHINE as qoriq-arm64

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb
index 0b237a6..0a6d97d 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb
@@ -30,4 +30,4 @@ INSANE_SKIP_${PN} = "ldflags"
 INHIBIT_PACKAGE_STRIP = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 PARALLEL_MAKE = ""
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.7.4

[PATCH v2 32/41] dpdk: set COMPATIBLE_MACHINE as qoriq

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/dpdk/dpdk_17.11.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/dpdk/dpdk_17.11.bb b/recipes-extended/dpdk/dpdk_17.11.bb
index 58558b4..f9fe91e 100644
--- a/recipes-extended/dpdk/dpdk_17.11.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.bb
@@ -101,4 +101,4 @@ FILES_${PN}-dev += "${datadir}/mk ${datadir}/scripts \
 FILES_${PN}-examples += "${datadir}/examples"
 
 FILES_${PN}-staticdev += "/usr/share/dpdk/cmdif/lib/*.a"
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)"
+COMPATIBLE_MACHINE = "(qoriq)"
-- 
2.7.4

[PATCH v2 33/41] ceetm: set COMPATIBLE_MACHINE as qoriq

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-kernel/ceetm/ceetm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index e3fbcab..57fbbe4 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -19,6 +19,6 @@ do_install(){
 FILES_${PN} += "${libdir}/tc"
 INHIBIT_PACKAGE_STRIP = "1"
 
-COMPATIBLE_MACHINE = "(b4|t1|t2|t4|ls1043a|ls1046a|ls2088a|ls1088a)"
+COMPATIBLE_MACHINE = "(qoriq)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

[PATCH v2 34/41] optee-test-qoriq: set COMPATIBLE_MACHINE as qoriq-arm64

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-security/optee/optee-test-qoriq_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-security/optee/optee-test-qoriq_git.bb b/recipes-security/optee/optee-test-qoriq_git.bb
index 51f0014..a9aaffc 100644
--- a/recipes-security/optee/optee-test-qoriq_git.bb
+++ b/recipes-security/optee/optee-test-qoriq_git.bb
@@ -46,4 +46,4 @@ FILES_${PN} += "/lib/optee_armtz/"
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls1043ardb|ls1046ardb|ls1012ardb)"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.7.4

[PATCH v2 35/41] t2080rdb: add ls2-phy to EXTRA_IMAGEDEPENDS

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/t2080rdb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index b3e4528..bfcb768 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -24,6 +24,6 @@ KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ls2-phy"
 
 USE_VT ?= "0"
-- 
2.7.4

[PATCH v2 36/41] t2080rdb-64b: add ls2-phy to EXTRA_IMAGEDEPENDS

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/t2080rdb-64b.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index b9534af..c46d94c 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -24,6 +24,6 @@ KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ls2-phy"
 
 USE_VT ?= "0"
-- 
2.7.4

[PATCH v2 37/41] t4240rdb: add ls2-phy to EXTRA_IMAGEDEPENDS

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/t4240rdb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index f72a490..9f86345 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -19,6 +19,6 @@ KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ls2-phy"
 
 USE_VT ?= "0"
-- 
2.7.4

[PATCH v2 38/41] t4240rdb-64b: add ls2-phy to EXTRA_IMAGEDEPENDS

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/t4240rdb-64b.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index c0f466b..0ccfce7 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -19,6 +19,6 @@ KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ls2-phy"
 
 USE_VT ?= "0"
-- 
2.7.4

[PATCH v2 39/41] u-boot-qoriq: update sysroot path

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*fix the below error
|powerpc-fslmllib32-linux-ld: cannot find -lgcc

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
index d01efdd..8438134 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
@@ -22,7 +22,7 @@ python () {
             raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        workdir = d.getVar('WORKDIR')
         d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
         d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
@@ -32,7 +32,7 @@ python () {
             raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        workdir = d.getVar('WORKDIR')
         d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
         d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
-- 
2.7.4

[PATCH v2 40/41] remove ppa in machine config

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*ppa recipes will be removed.

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1012afrwy-32b.conf | 2 +-
 conf/machine/ls1012ardb-32b.conf  | 2 +-
 conf/machine/ls1043ardb-32b.conf  | 2 +-
 conf/machine/ls1043ardb-be.conf   | 2 +-
 conf/machine/ls1046ardb-32b.conf  | 2 +-
 conf/machine/ls1046ardb-be.conf   | 2 +-
 conf/machine/ls1088ardb-be.conf   | 2 +-
 conf/machine/ls2088ardb-be.conf   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/machine/ls1012afrwy-32b.conf b/conf/machine/ls1012afrwy-32b.conf
index 9fdff03..88f071e 100644
--- a/conf/machine/ls1012afrwy-32b.conf
+++ b/conf/machine/ls1012afrwy-32b.conf
@@ -25,7 +25,7 @@ UBOOT_CONFIG[qspi-secure-boot] = "ls1012afrwy_qspi_SECURE_BOOT_defconfig,,u-boot
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb"
 KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw"
+EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1012ardb-32b.conf b/conf/machine/ls1012ardb-32b.conf
index 1fe13d5..43abf70 100644
--- a/conf/machine/ls1012ardb-32b.conf
+++ b/conf/machine/ls1012ardb-32b.conf
@@ -26,7 +26,7 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa rcw"
+EXTRA_IMAGEDEPENDS += "rcw"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1043ardb-32b.conf b/conf/machine/ls1043ardb-32b.conf
index 4e4d472..aa7f3f6 100644
--- a/conf/machine/ls1043ardb-32b.conf
+++ b/conf/machine/ls1043ardb-32b.conf
@@ -31,7 +31,7 @@ KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa qe-ucode"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1043ardb-be.conf b/conf/machine/ls1043ardb-be.conf
index ef80001..3582162 100644
--- a/conf/machine/ls1043ardb-be.conf
+++ b/conf/machine/ls1043ardb-be.conf
@@ -35,6 +35,6 @@ LE_UBOOT_FOR_ARMBE_TARGET = "1"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode ppa rcw qe-ucode"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
 
 USE_VT = "0"
diff --git a/conf/machine/ls1046ardb-32b.conf b/conf/machine/ls1046ardb-32b.conf
index 0fe97b1..4267c0f 100644
--- a/conf/machine/ls1046ardb-32b.conf
+++ b/conf/machine/ls1046ardb-32b.conf
@@ -32,7 +32,7 @@ KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1046ardb-be.conf b/conf/machine/ls1046ardb-be.conf
index bfff9d9..0f72d57 100644
--- a/conf/machine/ls1046ardb-be.conf
+++ b/conf/machine/ls1046ardb-be.conf
@@ -33,5 +33,5 @@ KERNEL_DEVICETREE ?= "\
 "
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
 USE_VT = "0"
diff --git a/conf/machine/ls1088ardb-be.conf b/conf/machine/ls1088ardb-be.conf
index 40ffff5..3460a9c 100644
--- a/conf/machine/ls1088ardb-be.conf
+++ b/conf/machine/ls1088ardb-be.conf
@@ -30,5 +30,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex"
 USE_VT = "0"
diff --git a/conf/machine/ls2088ardb-be.conf b/conf/machine/ls2088ardb-be.conf
index ac8c476..71cf596 100644
--- a/conf/machine/ls2088ardb-be.conf
+++ b/conf/machine/ls2088ardb-be.conf
@@ -31,5 +31,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex ppa"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex"
 USE_VT = "0"
-- 
2.7.4

[PATCH v2 41/41] uefi: add judge if folder exist

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/uefi/uefi_git.bb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index 4d08782..8b63f50 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -11,15 +11,19 @@ SRCREV= "5b259f75decbc478bcab0612d79a58562bef1838"
 S = "${WORKDIR}/git"
 
 do_install () {
-       install -d ${D}/uefi
-       cp -r  ${B}/grub ${D}/uefi
-       cp -r  ${B}/${MACHINE} ${D}/uefi
+       if [ -d ${B}/${MACHINE} ]; then
+           install -d ${D}/uefi
+           cp -r  ${B}/grub ${D}/uefi
+           cp -r  ${B}/${MACHINE} ${D}/uefi
+       fi
 }
 
 do_deploy () {
-       install -d ${DEPLOYDIR}/uefi
-       cp -r  ${B}/grub   ${DEPLOYDIR}/uefi
-       cp -r  ${B}/${MACHINE} ${DEPLOYDIR}/uefi
+       if [ -d ${B}/${MACHINE} ]; then
+           install -d ${DEPLOYDIR}/uefi
+           cp -r  ${B}/grub   ${DEPLOYDIR}/uefi
+           cp -r  ${B}/${MACHINE} ${DEPLOYDIR}/uefi
+       fi
 }
 addtask deploy before do_build after do_install
 
-- 
2.7.4