[meta-freescale-layer master][PATCH v2 00/20] Update of QorIQ SDK 2.0 GA-1611 release

[meta-freescale-layer master][PATCH v2 00/20] Update of QorIQ SDK 2.0 GA-1611 release

[Zhenhua Luo]

The following is the major change.
1. upgrade u-boot to 2016.09
2. add ls1046ardb support
3. add ls1043ardb-32b and ls1046ardb-32b support 
4. move ppa to genetic git tree 
5. bug fixes for other packages

Zhenhua Luo (20):
  linux-qoriq: upgrade to SDK 2.0 GA1611 release
  fmc: upgrade to SDK 2.0 GA-1611 release
  fmlib: upgrade to SDK 2.0 GA-1611 release
  fm-ucode: support ls1046ardb boards
  eth-config: upgrade to SDK 2.0 GA-1611 release
  usdpaa: upgrade to SDK 2.0 GA-1611 release
  usdpaa-apps: upgrade to SDK 2.0 GA-1611 release
  dpa-offload: upgrade to SDK 2.0 GA-1611 release
  ppa: migrate to generic ppa tree
  u-boot: upgrade to 2016.09
  rcw: upgrade to SDK 2.0 GA-1611 release
  ceetm: support ls1046a targets
  kernel-module-ar: set CLEANBROKEN to 1
  cst: upgrade to SDK 2.0 GA-1611 release
  qemu-qoriq: support 32b build for arm64 platforms
  change-file-endianess: update byte_swap script to support ls1046
  ls1043ardb-32b: add machine conf file
  ls1046ardb: add machine conf
  ls1046ardb-32b: add machine conf
  ls1043ardb.conf: add fsl-lsch2 in MACHINEOVERRIDES

 conf/machine/ls1043ardb-32b.conf                   | 33 ++++++++++++++++++
 conf/machine/ls1043ardb.conf                       |  2 +-
 conf/machine/ls1046ardb-32b.conf                   | 33 ++++++++++++++++++
 conf/machine/ls1046ardb.conf                       | 27 +++++++++++++++
 .../openembedded-layer/recipes-dpaa/fmc/fmc_git.bb |  5 +--
 .../recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb    |  8 +++--
 .../change-file-endianess/change-file-endianess.bb | 13 +++++--
 .../change-file-endianess/byte_swap.tcl            |  6 +++-
 recipes-bsp/ppa/ppa_git.bb                         | 31 ++++++++---------
 recipes-bsp/rcw/rcw_git.bb                         | 13 ++++---
 ...ot-qoriq_2016.01.bb => u-boot-qoriq_2016.09.bb} | 40 +++++++++++++---------
 recipes-devtools/cst/cst_git.bb                    |  2 +-
 recipes-devtools/qemu/qemu-qoriq_git.bb            |  1 +
 recipes-dpaa/dpa-offload/dpa-offload_git.bb        |  6 ++--
 recipes-dpaa/eth-config/eth-config_git.bb          |  2 +-
 recipes-dpaa/fm-ucode/fm-ucode_git.bb              |  3 +-
 recipes-dpaa/fmlib/fmlib_git.bb                    |  3 +-
 recipes-dpaa/usdpaa/usdpaa_git.bb                  |  6 ++--
 recipes-kernel/ceetm/ceetm_git.bb                  |  2 +-
 .../kernel-modules/kernel-module-ar_git.bb         |  2 ++
 recipes-kernel/linux/linux-qoriq_4.1.bb            | 14 ++++++--
 21 files changed, 192 insertions(+), 60 deletions(-)
 create mode 100644 conf/machine/ls1043ardb-32b.conf
 create mode 100644 conf/machine/ls1046ardb-32b.conf
 create mode 100644 conf/machine/ls1046ardb.conf
 rename recipes-bsp/u-boot/{u-boot-qoriq_2016.01.bb => u-boot-qoriq_2016.09.bb} (71%)

-- 
2.7.4

[meta-freescale-layer master][PATCH v2 01/20] linux-qoriq: upgrade to SDK 2.0 GA1611 release

[Zhenhua Luo]

* add 32b build support for aarch64 targets, e.g. ls1043ardb-32b, ls1046ardb-32b
* include the following changes
  4004071 Merge branch 'feature/rt-v4.1.30' into yocto/sdk-2.0.x
  937dcab Merge branch 'feature/usdpaa' into yocto/sdk-2.0.x
  b623c51 Merge branch 'feature/asf' into yocto/sdk-2.0.x
  a0c7a9b Merge pull request #1559 in SDK/linux-sdk2.0 from sdk-rcpm-fix-copyright to sdk-v2.0.x
  302aca3 nxp: rcpm: fix copyright
  f05e97b Merge pull request #1556 in SDK/linux-sdk2.0 from jira/QSDK-3119 to sdk-v2.0.x
  5126cb5 dts: ls1046a: fix PMU compatible
  2db3941 Merge pull request #1555 in SDK/linux-sdk2.0 from jira/QLINUX-6194 to sdk-v2.0.x
  1054c80 Merge pull request #1553 in SDK/linux-sdk2.0 from jira/config/QLINUX-6192 to sdk-v2.0.x
  ce1586f Merge pull request #1554 in SDK/linux-sdk2.0 from jira/QSDK-3117 to sdk-v2.0.x
  1d848c9 Merge pull request #1551 in SDK/linux-sdk2.0 from jira/QLINUX-6155-gianfar-upstream_fix to sdk-v2.0.x
  f22fd4c arm64: dts: ls1046a: add qdma device tree node
  862e403b dts: powerpc: t104x: add ceetm node
  6ec4c00 irqchip/ls-scfg-msi: Enable Layerscape 32bit SCFG MSI support
  a0e8417 gianfar: fix size of scatter-gathered frames
  3d80646 Merge pull request #1550 in SDK/linux-sdk2.0 from jira/QLINUX-6140 to sdk-v2.0.x
  4c35d4d vfio fsl-pamu: Fix compilation error __udivdi3
  dea239d Merge pull request #1549 in SDK/linux-sdk2.0 from jira/dpaa-ethernet/QLINUX-6139 to sdk-v2.0.x
  ca1bbde dpaa_eth: do not evaluate the A010022 erratum on PPC64
  aa29390 Merge pull request #1548 in SDK/linux-sdk2.0 from jira/dpaa-ethernet/QLINUX-6139 to sdk-v2.0.x
  a318137 dpaa_eth: rework runtime support for erratum A010022
  1f2ce64 dpaa_eth: simplify condition
  1fbb450 Merge pull request #1537 in SDK/linux-sdk2.0 from jira/QLINUX-5777 to sdk-v2.0.x
  ad4a28c Merge pull request #1546 in SDK/linux-sdk2.0 from release/ls1046a to sdk-v2.0.x
  73a0f66 Merge pull request #1545 in SDK/linux-sdk2.0 from feature/kvm to sdk-v2.0.x
  2b22132 Merge pull request #1544 in SDK/linux-sdk2.0 from jira/QLINUX-5953 to feature/kvm
  b4ea505 Merge pull request #1543 in SDK/linux-sdk2.0 from jira/QLINUX-6045 to feature/kvm
  4c47a0d Merge pull request #1476 in SDK/linux-sdk2.0 from jira/qman/QLINUX-5730-qman_high-sync-with-user-space to sdk-v2.0.x
  31c4c0b Merge pull request #1536 in SDK/linux-sdk2.0 from jira/QLINUX-5947 to release/ls1046a
  479b1fc On ARM64 register index of 31 corresponds to both zero register and SP. However, all memory access instructions, use ZR as transfer register. SP is used only as a base register in indirect memory addressing, or by register-register arithmetics, which cannot be trapped here.
  77780d1 arm64/kvm: ls1046a: Add generic v8 KVM target
  27fe8a5 staging/fsl_qbman: Fix warnings in self tests
  e11546d fsl_qbman/qman_high.c: Style cleanup
  55e071c fsl_qbman/qman_high.c: Release resources if error
  f69c8b4 fsl_qbman/qman_high: lni_shaper_disable byte swap
  442baed qman_high.c: Endian swap FD for LE CPUs
  1d66e04 qbman: Clear interrupt in status register
  a2a4407 fsl_qbman/qman_high: Check LNI state before enable
  c95fe7d fsl_qbman/qman_high: Check qman version
  6736347 fsl_qman/qman_high: Update unclean portal handling
  62ac0bd fsl_qbman: Add error print in message ring cleanup
  43317b7 Merge pull request #1539 in SDK/linux-sdk2.0 from jira/dpaa-ethernet/QLINUX-5974 to sdk-v2.0.x
  e0c7a72 dts: ls1046a: Add PCI and MSI nodes
  1a90f80 arm64:pci: fix the IOV device enabled crash issue in designware
  0372d4d pci/layerscape: add LS1046A support
  c5d939c irqchip/ls-scfg-msi: Add MSI test support
  d52e522 irqchip/ls-scfg-msi: add Layerscape SCFG MSI support
  2561dca dts: ls1043a: update MSI node
  4feed16 dts: ls1021a: update MSI node
  93b4616 dt/bindings: Add bindings for Layerscape SCFG MSI
  b366f3a dts: ls1043a: change GIC register for rev1.1
  7200f11 arm64: ls1046a: dts: add rcpm and ftm0 nodes
  0256287 drivers: soc: add the RCPM driver
  42591a49 cpuidle: remove cpu_pm calls when entering a idle state
  915455c arm64: PSCI: support Suspend-to-RAM state
  136070a doc: update rcpm.txt from upstream
  b1d0ac8 Merge pull request #1470 in SDK/linux-sdk2.0 from jira/qman/QLINUX-5645-qbman-bad-dqqr-sz to sdk-v2.0.x
  df0a3d4 Merge pull request #1467 in SDK/linux-sdk2.0 from jira/qman/QLINUX-5727-debug-printf-left-in-source to sdk-v2.0.x
  d3f1454 Merge pull request #1538 in SDK/linux-sdk2.0 from jira/qman/QLINUX-5976 to sdk-v2.0.x
  ea46d10 dpaa_eth: enable the 4K workaround only for the LS1043 SoC
  9d8a40d fsl/fman: use QBMan API
  c116614 fsl_qman: proper dmaa_addr_t specifier
  1d39525 fsl_bman: proper dmaa_addr_t specifier
  68e4a9c dpaa_eth: add arm 32bit support
  cd6f54d dpaa_eth: use proper dma_map size when recycling
  9e9a00d dpaa_eth: use QBMan API
  84730fa fmd: remove udivdi3
  98feb23 fsl_qbman: Use cache inhibited portals on LS1046
  007477a soc: fsl: Add ls1046a to GUTS
  9ef52a0 base: soc: introduce soc_device_match() interface
  a109bb8 soc: fsl: rewrite GUTS driver
  fec049a fsl_qbman: Enable EQCR CI Stashing
  f8d1192 fsl_qbman: Don't use cacheline zero operation on ARM
  880da59 fsl_qbman: Fix DQRR shadow copy alignment
  439f884 fsl_qbman: fix ARM64 write prefetch macro
  7b05170 fsl_qbman: fix ARM64 prefetch instructions
  99c8c40 fsl_qbman: Only invalidate/prefech on PPC systems when PAMU is disabled
  72b974d fsl_qman: use original dq in qm_dqrr_cdc_consume_1ptr()
  a1c99db fsl_qman: fix EQCR_COMMIT_CHECKS for LE
  f8773f0 fsl_pme: Update PME scatter/gather API usage
  4d3026c fsl_dce: Update DCE scatter/gather API usage
  bc45052 fsl/qman: endianness changes
  805c887 fsl_qman: add support for qman portal v3.2.1
  e730580 fsl_qbman/qman_high.c: Remove debug print
  6e237d9 fsl_pamu: erratum a007907 should be applied on all versions of E6500 chips.
  769caaf Merge pull request #1530 in SDK/linux-sdk2.0 from release/ls1046a to sdk-v2.0.x
  019cc06 Merge pull request #1529 in SDK/linux-sdk2.0 from jira/QLINUX-6040-32-bit-kernel-support-integration to sdk-v2.0.x
  4a8a3c4 fsl_qbman: fix QBmanTest compile error on arm 32bit
  27b9fe6 arm: layerscape: add ITS for ls1046ardb aarch32 platform
  14d4d34 arm: layerscape: add ITS for ls1043ardb aarch32 platform
  6513e86 arm64: dts: Update address-cells and reg properties of cpu nodes
  24af721 Armv8: aarch32: Add ITS for LS1012A AArch32 support
  21da194 arm: layerscape: enable ppfe in defconfig
  e08460c arm: layerscape: enable dpaa ethernet in defconfig
  50c8128 dpaa_eth: add arm 32bit support
  4a441cd arm: add pgprot_cached and pgprot_cached_ns support
  ebb7268 arm: add new non-shareable ioremap
  051e365 armv8: aarch32: Add KVM support for AArch32 on ARMv8
  1e46b40 armv8: aarch32: Add AArch32 defconfig for LayerScape SoCs
  4434d96 armv8: aarch32: Update Kconfig to support ARCH_LAYERSCAPE_AARCH32
  c04c0f1 armv8: aarch32: Allow RAM to be mapped for LayerScape SoC
  846fbe1 armv8: aarch32: Add SMP support for 32-bit Linux kernel
  cb96fb1 armv8: aarch32: Execute 32-bit Linux for LayerScape platforms
  fbfccce Merge pull request #1528 in SDK/linux-sdk2.0 from jira/QLINUX-6038 to release/ls1046a
  5455e08 spi-nor: fslquad: add quad mode read for s25fs512s
  70fa4fd mtd: spi-nor: fsl-quad: Add flash S25FS extra support
  034bad1 spi: dspi: clear SPI_SR before enable interrupt
  6de3d6d dpa_offload/dpa_stats: Fix bad propagation of counters offsets to US during sync get_counters
  b047fdb dpa_offload/dpa_ipsec: Remove IPSec special manip chain before the node
  a16bb04 dpa_offload/dpa_classifier: Release header manip chain when table insert is unsuccessful
  e93fd06 dpa_offload: Add LS1046ARDB device tree files
  4da5830 dpa_offload: Align number of network interfaces in LS1043ARDB device tree files
  c5d6566 dpa_offload: Add support for offloading PPPoE flows
  1fd7d61 dpa_offload/dpa_classifier: Improve support for "return-to-keygen" table entries
  74187b4 dpa_offload/dpa_classifier: Always interpret IPv4 address in big endian
  b8cf88f dpa_offload/dpa_stats: Fix IOCTL return code in case of error
  45d601d dpa_offload/dpa_stats: Add support for LE platforms
  091ccb2 dpa_offload: Add IPSec offloading scenario device tree file for LS1043ARDB
  5a647f2 dpa_offload/dpa_ipsec: Add support for LE platforms
  502e729 dts: ls1046a: disable sata ecc
  9cf974c sata: ls1046a: added ls1046a sata support
  83db7d7 mmc: core: Optimize case for exactly one erase-group budget
  f1927d4 mmc: sdhci-of-esdhc: enable IRQ detecting mode for LS1046A
  ef0951b ls1046a_usdpaa_dts: Patch to fix issue in usdpaa dts
  c761ef7 net: phy: fixed: propagate fixed link values to struct
  1cb5367 freescale.config: remove CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
  cc59f31 cpufreq: qoriq: add dfs support on ls1046a soc
  c10521a ls1046aqds_usdpaa_dts: Patch to add dts for ls1046aqds
  e5f0d60 freescale.config: add NVMe support
  06d5f31 usdpaa_dts: Patch to add usdpaa dts for LS1046ARRDB
  425f832 ITS: use ls1046ardb rootfs
  f00abb8 freescale.config: enable qDMA and testdma
  a95e599 freescale.config: enable some config options
  0d1003c ls1046aqds: add its file
  209a3e5 freescale.config: enable macro for LS1046ARDB
  2228977 ls1046ardb: add ITS file
  a0765d1 arm/ls1-msi: fix typo of MSI compatible string
  5c6248f net: phy: add driver for aquantia AQR106/107 phy
  d93acf6 rtc: pcf2127: add pcf2129 device id
  6dddef7 clk: qoriq: add ls1046a support
  5bcf71e arm64: dts: ls1046a: fix compatible for esdhc
  6a37ce8 arm64: dts: ls1046ardb: add dpaa nodes
  75bc6da arm64: dts: ls1046aqds: add dpaa nodes
  f9b5811 arm64: dts: add dpaa nodes in .dtsi
  3866c5e arm64: dts: add LS1046A-QDS board support
  f39e5f1 Documentation: DT: Add entry for QorIQ LS1046A-QDS board
  b661c31 arm64: dts: add LS1046A-RDB board support
  39a74c1 Documentation: DT: Add entry for QorIQ LS1046A-RDB board
  9b21627 arm64: dts: add QorIQ LS1046A SoC support
  388603e dt-bindings: ahci-fsl-qoriq: updated for SoC ls1046a
  202e350 dt-bindings: qoriq-clock: update for more SoCs
  c8d2cec dt-bindings: i2c: adds two more nxp devices
  0dfadf7 dt-bindings: fsl: updates bindings for some SoC-specific devices
  9148f56 dt-bindings: fsl: update for more SoCs
  cf53f83 Merge pull request #1525 in SDK/linux-sdk2.0 from jira/fman/QLINUX-6077 to sdk-v2.0.x
  ad55d2b Merge pull request #1524 in SDK/linux-sdk2.0 from jira/fman/QLINUX-5975 to sdk-v2.0.x
  d3542db Merge pull request #1526 in SDK/linux-sdk2.0 from jira/fman/QSDK-2131 to sdk-v2.0.x
  4da5272e QSDK-2131: A-008975: The FMAN controller cannot allow empty look-up tables
  136e497 QLINUX-6077: A-007273: FMAN hangs at FM reset done with MACs clocks disabled
  bc36f58 QLINUX-5975: LS1046A DPAA Fman driver integration
  f70a57c Merge pull request #1508 in SDK/linux-sdk2.0 from jira/rman/QLINUX-6067 to sdk-v2.0.x
  6b22a60 uio/rman: use the generic IO access function
  ea1a5e4 dpio/qbman: fix discrete consumption
  206af2a fsl_qbman/qman_high.c: Remove debug print

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/linux/linux-qoriq_4.1.bb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bb b/recipes-kernel/linux/linux-qoriq_4.1.bb
index c97104e..587ecd9 100644
--- a/recipes-kernel/linux/linux-qoriq_4.1.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \
     file://CVE-2016-2053.patch \
     file://CVE-2016-0758.patch \
 "
-SRCREV = "667e6ba9ca2150b3cabdd0c07b57d1b88ef3b86a"
+SRCREV = "4004071c129a776136e71f6a85383fea87f5db75"
 
 S = "${WORKDIR}/git"
 
@@ -36,8 +36,7 @@ ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 SCMVERSION ?= "y"
 LOCALVERSION = ""
 DELTA_KERNEL_DEFCONFIG ?= ""
-DELTA_KERNEL_DEFCONFIG_prepend_ls1043ardb = "freescale.config "
-DELTA_KERNEL_DEFCONFIG_prepend_ls2080ardb = "freescale.config "
+DELTA_KERNEL_DEFCONFIG_prepend_qoriq-arm64 = "freescale.config "
 
 do_merge_delta_config() {
     # copy desired defconfig so we pick it up for the real kernel_do_configure
@@ -58,6 +57,15 @@ do_merge_delta_config() {
 }
 addtask merge_delta_config before do_preconfigure after do_patch
 
+# The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b)
+do_compile_prepend_fsl-lsch2-32b() {
+    ln -sfT ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/freescale ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale
+}
+
+do_install_prepend_fsl-lsch2-32b() {
+    rm -f ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale
+}
+
 do_install_append_qoriq-arm() {
     install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION}
     ln -sf zImage-${KERNEL_VERSION} ${D}/boot/zImage
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 02/20] fmc: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

* add ls1046a targets support
* include the following changes
  81e4796 Revert default platform flag to P4080
  4729b49 Enable support for LS1046 (based on LS1043 integration)

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 3663f26..aff5130 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -6,8 +6,8 @@ PR = "r2"
 
 DEPENDS = "libxml2 fmlib tclap"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;branch=sdk-v1.9.x"
-SRCREV = "a079d2c844edd85dff85a317a63198e7988bcd09"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;branch=sdk-v2.0.x"
+SRCREV = "81e4796fd22e32fe7ab77f075c1879d7bb75c02e"
 
 S = "${WORKDIR}/git"
 
@@ -24,6 +24,7 @@ EXTRA_OEMAKE_PLATFORM_t2 = "b4860qds"
 EXTRA_OEMAKE_PLATFORM_t4 = "b4860qds"
 EXTRA_OEMAKE_PLATFORM_t1 = "t1040qds"
 EXTRA_OEMAKE_PLATFORM_ls1043a = "ls1043"
+EXTRA_OEMAKE_PLATFORM_ls1046a = "ls1046"
 
 do_compile () {
     oe_runmake MACHINE=${EXTRA_OEMAKE_PLATFORM} -C source
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 03/20] fmlib: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

* add ls1046a targets build support
* include the following changes
  caec18a use mcpu option as 'cortex-a57' for Cortex A72
  1f28ceb Makefile fix for LS1046
  7e73160 Enable support for LS1046(based on LS1043 integration files)

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-dpaa/fmlib/fmlib_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index c2d4575..8a7f9a7 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f16fa8e677e45af3127c5c4bafc3c00"
 PR = "r1"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/fmlib.git;branch=sdk-v2.0.x"
-SRCREV = "43fa98fdbf0c697167e415c3f060896d5b482791"
+SRCREV = "caec18a71ed702a176892efaf946281b9160e220"
 
 S = "${WORKDIR}/git"
 
@@ -14,6 +14,7 @@ TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
 TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
 TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
 TARGET_ARCH_FMLIB_ls1043a = "arm64a53"
+TARGET_ARCH_FMLIB_ls1046a = "arm64a72"
 
 EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
         CROSS_COMPILE=${TARGET_PREFIX} KERNEL_SRC=${STAGING_KERNEL_DIR}"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 04/20] fm-ucode: support ls1046ardb boards

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-dpaa/fm-ucode/fm-ucode_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index fef79f8..5af1814 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -19,6 +19,7 @@ REGLEX_t1042 = "t1040"
 REGLEX_b4420 = "b4860"
 REGLEX_t4160 = "t4240"
 REGLEX_ls1043a = "t2080"
+REGLEX_ls1046a = "t2080"
 
 do_install () {
     UCODE=`echo ${REGLEX} | sed -e 's,-.*$,,' -e 's,[a-zA-Z]*$,,'`
@@ -37,6 +38,6 @@ PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 ALLOW_EMPTY_${PN} = "1"
 
-COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|ls1043a)"
+COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|fsl-lsch2)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 05/20] eth-config: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

* 664ba13 eth_config: Add support for LS1046ARDB/QDS

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-dpaa/eth-config/eth-config_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb
index 7e5c396..6507613 100644
--- a/recipes-dpaa/eth-config/eth-config_git.bb
+++ b/recipes-dpaa/eth-config/eth-config_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ed5eddbfbb84af5089ea94c382d423c"
 PR = "r2"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/eth-config.git;branch=sdk-v2.0.x"
-SRCREV = "c1a4b3ae8e2bb6e5abe4d316e5d1f339085e8156"
+SRCREV = "664ba136cfdb42116d9617176deda7c25ede9db9"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 06/20] usdpaa: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

* a21c62e qbman: add support for qman portal v3.2.1

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-dpaa/usdpaa/usdpaa_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
index 9aac0f0..193d8ba 100644
--- a/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -8,12 +8,12 @@ inherit pkgconfig
 DEPENDS += "flib"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;branch=sdk-v2.0.x"
-SRCREV = "940d8f7f989c567b8c554ddba7bc4f0f4f21eb11"
+SRCREV = "a21c62ec9ac015f6c37f89d595e892852055b0fb"
 
 S = "${WORKDIR}/git"
 
 WRAP_ARCH ?= "${TARGET_ARCH}"
-WRAP_ARCH_ls1043ardb = "arm64"
+WRAP_ARCH_fsl-lsch2 = "arm64"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}" ARCH="${WRAP_ARCH}"'
 
 do_install () {
@@ -22,6 +22,6 @@ do_install () {
 
 PARALLEL_MAKE_pn-${PN} = ""
 
-COMPATIBLE_MACHINE = "(qoriq-ppc|ls1043a)"
+COMPATIBLE_MACHINE = "(qoriq-ppc|fsl-lsch2)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 07/20] usdpaa-apps: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

The following changes are included:
* 8fe2e96 usdpaa_apps: Patch to add ipsecfwd config script for perf.
* 9d7f0fe usdpaa_apps: Patch to add lpm ipfwd config scripts for perf.
* f03552a Merge pull request #27 in SDK/usdpaa-apps from ~B06830/usdpaa-apps:bugfix/QUSDPA-869 to sdk-v2.0.x
* 88c1539 ipsecfwd, simple_proto: use DKP for MDHA split key generation
* 41d9630 usdpaa_apps: Patch to fix next header protocol in esp header
* a889294 usdpaa_apps: Patch to add ipfwd_config file for perf.
* 1ef1d53 Merge pull request #18 in SDK/usdpaa-apps from ~B06830/usdpaa-apps:bugfix/QUSDPA-838 to sdk-v2.0.x
* 6172983 usdpaa_apps: Patch to use default queue for functionality
* b992189 usdpa_app: Patch to add ls1046a support in standalone-env.
* 53851fb usdpaa_app: Patch to add fmc config for LS1046ARDB
* 1c7a501 simple_proto: add supplementary MBMS test vectors
* 2536748 simple_proto: MBMS test vector fixes

Signed-off-by: Ting Liu <ting.liu@nxp.com
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 .../recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb                   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
index 19edd4a..c8de693 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
@@ -13,12 +13,12 @@ RDEPENDS_${PN}_append_b4860qds = " ipc-ust"
 RDEPENDS_${PN}_append_b4420qds = " ipc-ust"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/usdpaa-apps.git;branch=sdk-v2.0.x"
-SRCREV = "835cbceb4f76de1b493fea5dbe43a90f516b6f35"
+SRCREV = "8fe2e9669650d2f7ed26b43d860228ca0f7211a9"
 
 S = "${WORKDIR}/git"
 
 WRAP_ARCH ?= "${TARGET_ARCH}"
-WRAP_ARCH_ls1043a = "arm64"
+WRAP_ARCH_fsl-lsch2 = "arm64"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}" ARCH="${WRAP_ARCH}" EXTRA_LDFLAGS="${LDFLAGS}"'
 
 SOC ?= "P4080"
@@ -27,6 +27,7 @@ SOC_t1 = "T1040"
 SOC_t2 = "T2080"
 SOC_t4 = "T4240"
 SOC_ls1043a = "LS1043"
+SOC_ls1046a = "LS1043"
 
 FMAN_VARIANT ?= "P4080"
 FMAN_VARIANT_b4 = "FMAN_V3H"
@@ -34,6 +35,7 @@ FMAN_VARIANT_t1 = "FMAN_V3L"
 FMAN_VARIANT_t2 = "FMAN_V3H"
 FMAN_VARIANT_t4 = "FMAN_V3H"
 FMAN_VARIANT_ls1043a = "LS1043"
+FMAN_VARIANT_ls1046a = "LS1043"
 
 do_compile_prepend () {
     export SOC=${SOC}
@@ -60,6 +62,6 @@ do_install () {
 PARALLEL_MAKE_pn-${PN} = ""
 FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
 
-COMPATIBLE_MACHINE = "(qoriq-ppc|ls1043a)"
+COMPATIBLE_MACHINE = "(qoriq-ppc|fsl-lsch2)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 08/20] dpa-offload: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

The following changes are included:
* 68faa6a dpa_offload: Add support for offloading PPPoE flows
* 8bf3cdf dpa_offload/dpa_classifier: Improve support for "return-to-keygen" table entries

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-dpaa/dpa-offload/dpa-offload_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-dpaa/dpa-offload/dpa-offload_git.bb b/recipes-dpaa/dpa-offload/dpa-offload_git.bb
index eeb314a..3f59d9a 100644
--- a/recipes-dpaa/dpa-offload/dpa-offload_git.bb
+++ b/recipes-dpaa/dpa-offload/dpa-offload_git.bb
@@ -13,12 +13,12 @@ RDEPENDS_${PN}_append_b4860qds = " ipc-ust"
 RDEPENDS_${PN}_append_b4420qds = " ipc-ust"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/dpa-offload.git;branch=sdk-v2.0.x"
-SRCREV = "fed08b0667172fbe47d256b7d08be955e3333fdf"
+SRCREV = "68faa6a64745151fcfef73c9ddc612d9728c2f07"
 
 S = "${WORKDIR}/git"
 
 WRAP_ARCH ?= "${TARGET_ARCH}"
-WRAP_ARCH_ls1043ardb = "arm64"
+WRAP_ARCH_fsl-lsch2 = "arm64"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" ARCH="${WRAP_ARCH}"'
 
 FMAN_VARIANT ?= "P4080"
@@ -43,6 +43,6 @@ do_install () {
 ALLOW_EMPTY_${PN} = "1"
 PARALLEL_MAKE_pn-${PN} = ""
 
-COMPATIBLE_MACHINE = "(qoriq-ppc|ls1043a)"
+COMPATIBLE_MACHINE = "(qoriq-ppc|fsl-lsch2)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

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

[Zhenhua Luo]

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

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

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

[meta-freescale-layer master][PATCH v2 10/20] u-boot: upgrade to 2016.09

[Zhenhua Luo]

* Upgrade the u-boot to 2016.09
* disable the qspi endianness switch

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 ...ot-qoriq_2016.01.bb => u-boot-qoriq_2016.09.bb} | 40 +++++++++++++---------
 1 file changed, 24 insertions(+), 16 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-qoriq_2016.01.bb => u-boot-qoriq_2016.09.bb} (71%)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2016.09.bb
similarity index 71%
rename from recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
rename to recipes-bsp/u-boot/u-boot-qoriq_2016.09.bb
index 6214c46..0b39275 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.09.bb
@@ -21,7 +21,7 @@ DEPENDS_append_qoriq-ppc = " boot-format-native"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1 \
     file://fix-build-error-under-gcc6.patch \
 "
-SRCREV = "7b0fea8ada90cc8a0605bce012c2b0c82d3673d9"
+SRCREV = "199df35d12857a68d5c8ee999dbdd167c3888d62"
 
 S = "${WORKDIR}/git"
 
@@ -40,6 +40,14 @@ python () {
         d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE", False))
         d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-')
+    elif "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 = 'aarch64' + d.getVar('TARGET_VENDOR') + 'mllib64-linux'
+        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib64-' + d.getVar("MACHINE"))
+        d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-')
 }
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
@@ -49,33 +57,33 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
 inherit fsl-u-boot-localversion
 LOCALVERSION = "+fsl"
 
-do_compile_append_qoriq () {
-    unset i j
-    if [ -n "${UBOOT_CONFIG}" ];then
-        for config in ${UBOOT_MACHINE}; do
-            i=`expr $i + 1`;
-            for type in ${UBOOT_CONFIG}; do
-                j=`expr $j + 1`;
-                if [ $j -eq $i ]; then
+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
-                        # change qspi binary endianess
-                        tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl \
-                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} ${config}/u-boot.swap.bin 8
-                        cp ${config}/u-boot.swap.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
+                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
                     fi
                 fi
             done
-            unset j
+            unset k
         done
-        unset i
-    fi
+        unset j
+    done
+    unset i
 }
 
+
 PACKAGES += "${PN}-images"
 FILES_${PN}-images += "/boot"
 COMPATIBLE_MACHINE = "(qoriq)"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 11/20] rcw: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

* disable the endianness switch for qspi u-boot of SEC boot
* included the following commits.
  * 3252b8c Merge pull request #20 in SDK/rcw from ~B21989/sdk-rcw:jira/QSDK-3097 to master
  * cd271ee Merge pull request #19 in SDK/rcw from ~B52263/rcw:jira/QSDK-3096 to master
  * 6a558a2 ls1021a: Fix QSPI endian issue for QSPI boot on LS1021A boards
  * fbfddb3 ls1043a: Fix QSPI endian issue for QSPI boot on LS1043AQDS
  * 2485a22 ls1046a: fix PBI of changing QSPI endianness
  * 7304127 ls1043ardb: adds a RCW with GIC 4K supported
  * d413878 ls1043a: Add PBI of changing GIC offset to 4K
  * e914a5f Add a tclsh script to swap the rcw endian.
  * 8411b78 ls1046aqds: Add RCW for ls1046aqds board
  * 6d486d4 ls1046ardb: Add RCW for ls1046ardb board
  * 14de148 arm: ls1021a: add the core frequency to 1.2GHZ support
  * 98b6bc3 t2080rdb: update SRDS2PLL2CR1 to 0x08004100 for errata A-007186

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-bsp/rcw/rcw_git.bb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 8117861..e00c0a6 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,17 +8,21 @@ DEPENDS += "change-file-endianess-native tcl-native"
 inherit deploy
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=sdk-v2.0.x"
-SRCREV = "6ae9086528019ab55968da05c25bd319737c8e62"
+SRCREV = "3252b8cce8e5a214c8e652121ef9b9460663c65a"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=${D}/boot/rcw/"
+EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','')} DESTDIR=${D}/boot/rcw/"
 
 do_install () {
     oe_runmake install
     for f in `find ${D}/boot/rcw/ -name "*qspiboot*"`;do
+        if echo $f |grep -q "qspiboot_sben"; then
+            continue
+        fi
         f_swap=`echo $f |sed -e 's/qspiboot/qspiboot_swap/'`
         tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl $f $f_swap 8
+        mv -f $f_swap $f
     done
 }
 
@@ -31,6 +35,5 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_MACHINE = "(qoriq-ppc|ls1021a|ls1043a)"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-
+COMPATIBLE_MACHINE = "(qoriq)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 12/20] ceetm: support ls1046a targets

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@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 cff4a9c..44ca577 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -17,6 +17,6 @@ do_install(){
 FILES_${PN} += "${libdir}/tc"
 INHIBIT_PACKAGE_STRIP = "1"
 
-COMPATIBLE_MACHINE = "(b4|t1|t2|t4|ls1043a)"
+COMPATIBLE_MACHINE = "(b4|t1|t2|t4|ls1043a|ls1046a)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 13/20] kernel-module-ar: set CLEANBROKEN to 1

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/kernel-modules/kernel-module-ar_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 1087e23..f5018f4 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -28,3 +28,5 @@ do_install(){
 FILES_${PN} += "${bindir}/"
 INSANE_SKIP_${PN} = "ldflags"
 COMPATIBLE_MACHINE = "(t1040|t1042)"
+
+CLEANBROKEN = "1"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 14/20] cst: upgrade to SDK 2.0 GA-1611 release

[Zhenhua Luo]

The following commits are included.
* 67ee753 Add CST product license file.
* e78078b Merge pull request #32 in SDK/cst from ~B57223/cst:master to master
* eaceb20 LS1046ARDB: Add input files for IE_Key Extension
* baa6822 Add tcl script for byte swapping the images.
* 6ef61cd LS1046AQDS: Add input files for IE_Key Extension
* d3369bd LS1046AQDS: Add input files for nor secure boot
* b33a74f LS1012ARDB: Add input files for IE-Key Extension
* d802e28 Add input files for LS1046 QSPI target
* b4c1012 Add input files for LS2088_1088 target
* c060cda IE Table: Modify CCSR offset for PBI write cmd
* 3b20ac4 Add ppa input file for ls1012
* 57a7253 Add input files for LS1012

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@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 c9cc54a..25f89af 100644
--- a/recipes-devtools/cst/cst_git.bb
+++ b/recipes-devtools/cst/cst_git.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "bash"
 inherit kernel-arch
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=sdk-v2.0.x"
-SRCREV = "d1c6c28ee78f8ed2aa92dbd6c0c00e6defe1242b"
+SRCREV = "67ee75303916fc60dfd68ba1920932f57a8b9e94"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 15/20] qemu-qoriq: support 32b build for arm64 platforms

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-devtools/qemu/qemu-qoriq_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 5ae7d02..b9535d8 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -39,6 +39,7 @@ S = "${WORKDIR}/git"
 QEMU_TARGETS_qoriq-ppc = "ppc"
 QEMU_TARGETS_qoriq-arm = "arm"
 QEMU_TARGETS_qoriq_arm64 = "aarch64"
+QEMU_TARGETS_fsl-lsch2-32b = "arm"
 PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl'
 EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 16/20] change-file-endianess: update byte_swap script to support ls1046

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-bsp/change-file-endianess/change-file-endianess.bb  | 13 +++++++++++--
 .../change-file-endianess/byte_swap.tcl                     |  6 +++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/change-file-endianess/change-file-endianess.bb b/recipes-bsp/change-file-endianess/change-file-endianess.bb
index 2ad8c58..ff1828b 100644
--- a/recipes-bsp/change-file-endianess/change-file-endianess.bb
+++ b/recipes-bsp/change-file-endianess/change-file-endianess.bb
@@ -3,12 +3,11 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-
 SRC_URI = "file://byte_swap.tcl"
 
 RDEPENDS += "tcl-native"
 
-inherit native
+inherit native deploy
 
 S = "${WORKDIR}"
 
@@ -20,4 +19,14 @@ do_install () {
     install -m 755 ${WORKDIR}/byte_swap.tcl ${D}/${bindir}
 }
 
+do_deploy () {
+    :
+}
+
+do_deploy_class-native () {
+    install -d ${DEPLOYDIR}
+    cp -f ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${DEPLOYDIR}/
+}
+addtask deploy before do_build after do_populate_sysroot
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl b/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl
index a4e8008..c622202 100755
--- a/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl
+++ b/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl
@@ -18,12 +18,16 @@ if {$old_rem != 0} {
 	        append old_bin y
 	}
 }
-for {set i 0} {$i<[string length $old_bin]} {incr i $num_b} {
+for {set i 0} {$i<[expr $old_length-8]} {incr i $num_b} {
         for {set j $num_b} {$j>0} {incr j -1} {
                 append new_bin [string index $old_bin [expr $i+($j-1)]]
         }
 }
 
+for {set j 0} {$j<8} {incr j 1} {
+              append new_bin [string index $old_bin [expr $i+$j]]
+}
+
 for {set i 0} {$i<[string length $old_bin]} {incr i $num_b} {
         set binValue [string range $old_bin [expr $i+0] [expr $i+($num_b-1)]]
         binary scan $binValue H[expr $num_b*2] hexValue
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 17/20] ls1043ardb-32b: add machine conf file

[Zhenhua Luo]

The ls1043ardb-32b supports ls1043ardb board run in 32b mode.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 conf/machine/ls1043ardb-32b.conf | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 conf/machine/ls1043ardb-32b.conf

diff --git a/conf/machine/ls1043ardb-32b.conf b/conf/machine/ls1043ardb-32b.conf
new file mode 100644
index 0000000..7551413
--- /dev/null
+++ b/conf/machine/ls1043ardb-32b.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: NXP LS1043ARDB-32B
+#@SOC: LSCH2
+#@DESCRIPTION: Machine configuration for running LS1043A in 32B mode
+#@MAINTAINER: Ting Liu <ting.liu@nxp.com>
+
+MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1043a:"
+
+require conf/machine/include/qoriq-arm.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+DEFAULTTUNE = "armv7ahf-neon"
+
+UBOOT_CONFIG ??= "nand sdcard nor"
+UBOOT_CONFIG[nor] = "ls1043ardb_aarch32_config,,u-boot-dtb.bin"
+UBOOT_CONFIG[nand] = "ls1043ardb_aarch32_nand_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "ls1043ardb_aarch32_sdcard_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[secure-boot] = "ls1043ardb_aarch32_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin"
+
+KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls_aarch32_defconfig"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+EXTRA_IMAGEDEPENDS += "rcw fm-ucode qe-ucode"
+USE_VT = "0"
+
+require conf/multilib.conf
+MULTILIBS ?= "multilib:lib64"
+DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 18/20] ls1046ardb: add machine conf

[Zhenhua Luo]

Support the NXP aarch64 based ls1046a reference design board.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 conf/machine/ls1046ardb.conf | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 conf/machine/ls1046ardb.conf

diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
new file mode 100644
index 0000000..553950c
--- /dev/null
+++ b/conf/machine/ls1046ardb.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: NXP LS1046ARDB
+#@SOC: LSCH2
+#@DESCRIPTION: Machine configuration for running LS1046A in 64-bit mode
+#@MAINTAINER: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+MACHINEOVERRIDES =. "fsl-lsch2:ls1046a:"
+
+require conf/machine/include/qoriq-arm64.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+UBOOT_CONFIG ??= "sdcard qspi-secure-boot qspi"
+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"
+
+KERNEL_DEVICETREE ?= "\
+    freescale/fsl-ls1046a-rdb.dtb \
+    freescale/fsl-ls1046a-rdb-usdpaa.dtb \
+"
+KERNEL_DEFCONFIG ?= "${S}/arch/arm64/configs/defconfig"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa"
+USE_VT = "0"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 19/20] ls1046ardb-32b: add machine conf

[Zhenhua Luo]

Support the NXP aarch64 based ls1046a reference design board run in 32b mode.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 conf/machine/ls1046ardb-32b.conf | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 conf/machine/ls1046ardb-32b.conf

diff --git a/conf/machine/ls1046ardb-32b.conf b/conf/machine/ls1046ardb-32b.conf
new file mode 100644
index 0000000..0ea132a
--- /dev/null
+++ b/conf/machine/ls1046ardb-32b.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: NXP LS1046ARDB
+#@SOC: LSCH2
+#@DESCRIPTION: Machine configuration for running LS1046A in 32-bit mode
+#@MAINTAINER: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1046a:"
+
+require conf/machine/include/qoriq-arm.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+DEFAULTTUNE = "armv7ahf-neon"
+
+UBOOT_CONFIG ??= "emmc sdcard qspi"
+UBOOT_CONFIG[emmc] = "ls1046ardb_aarch32_emmc_defconfig,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "ls1046ardb_aarch32_sdcard_defconfig,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[qspi] = "ls1046ardb_aarch32_qspi_config,,u-boot-dtb.bin"
+
+KERNEL_DEVICETREE ?= "\
+    freescale/fsl-ls1046a-rdb.dtb \
+    freescale/fsl-ls1046a-rdb-usdpaa.dtb \
+"
+KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls_aarch32_defconfig"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+USE_VT = "0"
+
+require conf/multilib.conf
+MULTILIBS ?= "multilib:lib64"
+DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64"
-- 
2.7.4

[meta-freescale-layer master][PATCH v2 20/20] ls1043ardb.conf: add fsl-lsch2 in MACHINEOVERRIDES

[Zhenhua Luo]

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 conf/machine/ls1043ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index 4b474c8..d2a5862 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -5,7 +5,7 @@
 #              with ARM Cortext-A53 core
 #@MAINTAINER: Ting Liu <ting.liu@nxp.com>
 
-MACHINEOVERRIDES =. "ls1043a:"
+MACHINEOVERRIDES =. "fsl-lsch2:ls1043a:"
 
 require conf/machine/include/qoriq-arm64.inc
 require conf/machine/include/arm/arch-arm64.inc
-- 
2.7.4