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

[Zhenhua Luo <zhenhua.luo@nxp.com>]

* 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