[PATCH 00/60] patches for QorIQ SDK v1.9

[PATCH 00/60] patches for QorIQ SDK v1.9

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Cristian Stoica (1):
  pkc-host: do not install cli

Laurentiu Tudor (1):
  qemu-qoriq: enable back libusb through PACKAGECONFIG

Ting Liu (57):
  u-boot-qoriq: remove external-fsl reference
  u-boot-qoirq: update to commit eb3d4fc
  u-boot-qoriq: exit if UBOOT_CONFIG not supported
  u-boot-qoriq: fix indent
  u-boot-qoriq: avoid changing building directory
  linux-qoriq: update to commit 43cecda
  linux-qoriq: save the merged .config as ${WORKDIR}/defconfig
  linux-qoriq: update LOCALVERSION
  t1023rdb: build nor u-boot
  t1023rdb-64b: build nor u-boot
  b4860qds-64b: remove UBOOT_MACHINES setting
  t4160qds: build secure-boot u-boot
  ls1021atwr: support QSPI and IFC in SD boot
  t1040d4rdb: build usdpaa/usdpaa-shared-interfaces dtb
  t1040d4rdb-64b: build usdpaa/usdpaa-shared-interfaces dtb
  t1042d4rdb: build usdpaa/usdpaa-shared-interfaces dtb
  t1042d4rdb-64b: build usdpaa/usdpaa-shared-interfaces dtb
  ar: update COMPATIBLE_MACHINE for t104x
  ceetm: update COMPATIBLE_MACHINE for t104x
  kernel-module-ceetm: rename back to ceetm
  ceetm: update to commit 2c79d0b
  ceetm: remove useless do_configure_preappend
  ceetm: install ceetm.ko into /lib/modules/
  skmm-ep: add ARCH in EXTRA_OEMAKE
  kernel-module-skmm-host: rename back to skmm-host
  skmm-host: update to commit 41a448d
  apptrk: update to commit 4216af3
  rcw: swap qspi binary in do_install_append
  rcw: update to commit 521008f
  rcw: update COMPATIBLE_MACHINE as qoriq
  pkc-firmware: update to commmit 32804a0
  kernel-module-pkc-host: rename back to pkc-host
  pkc-host: update to commit 26df0a3
  pkc-host: set COMPATIBLE_MACHINE as qoriq-ppc
  qemu-qoriq: update to commit 8362a29
  qemu-qoriq: empty not supported PACKAGECKG
  qemu_qoriq: import ptest patches from poky
  qemu-qoriq: replace /usr/share with ${datadir}
  qemu-qoriq: porvide qemu
  cst: update to commit 65f79eb
  fmc: update to commit a079d2c
  fmlib: update to commit d697de9
  fm-ucode: update to commit 33c6c7a
  eth-config: set CLEANBROKEN to 1
  usdpaa: update to commit b73546d
  usdpaa-apps: update to commit 1d9418a
  kernel-module-asf: rename back to asf
  asf: not package .ko files in PN
  asf: remove empty install directories
  asf: update to commit 9580a62
  asf: remove unnecessary ending spaces
  qoriq-debug: remove
  cryptodev: update to commit 53e4d0fe
  ipc: update to commit b010e35
  ipc-module: define SOC outside of do_compile
  ipc-module: remove useless do_configure_preappend
  ipsec-demo: set COMPATIBLE_MACHINE as qoriq

Zhenhua Luo (1):
  linux-qoriq: support kernel delta defconfig managed in recipe folder

 conf/machine/b4860qds-64b.conf                     |   1 -
 conf/machine/ls1021atwr.conf                       |   7 +-
 conf/machine/t1023rdb-64b.conf                     |   7 +-
 conf/machine/t1023rdb.conf                         |   7 +-
 conf/machine/t1040d4rdb-64b.conf                   |   4 +-
 conf/machine/t1040d4rdb.conf                       |   4 +-
 conf/machine/t1042d4rdb-64b.conf                   |   4 +-
 conf/machine/t1042d4rdb.conf                       |   4 +-
 conf/machine/t4160qds.conf                         |   2 +-
 recipes-bsp/apptrk/apptrk_git.bb                   |   4 +-
 recipes-bsp/pkc-firmware/pkc-firmware_git.bb       |   6 +-
 ...ake-BOARDS-DESTDIR-overidable-in-Makefile.patch |  57 ---
 recipes-bsp/rcw/rcw_git.bb                         |  17 +-
 ...5xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch |  77 ----
 .../u-boot/files/Fix-the-depend-race-issue.patch   |  38 --
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb         |  66 ++--
 recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb  |   3 +-
 recipes-devtools/cst/cst_git.bb                    |   6 +-
 .../qemu/qemu-qoriq/add-ptest-in-makefile.patch    |  29 ++
 recipes-devtools/qemu/qemu-qoriq/run-ptest         |   8 +
 recipes-devtools/qemu/qemu-qoriq_git.bb            |  25 +-
 recipes-dpaa/eth-config/eth-config_git.bb          |   2 +
 recipes-dpaa/fm-ucode/fm-ucode_git.bb              |   4 +-
 recipes-dpaa/fmc/fmc_git.bb                        |   4 +-
 recipes-dpaa/fmlib/fmlib_git.bb                    |   4 +-
 recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb        |   4 +-
 recipes-dpaa/usdpaa/usdpaa_git.bb                  |   4 +-
 recipes-extended/ipc-ust/ipc.inc                   |   4 +-
 recipes-extended/skmm-ep/skmm-ep_git.bb            |   5 +-
 .../kernel-module-asf_git.bb => asf/asf_git.bb}    |  11 +-
 recipes-kernel/ceetm/ceetm_git.bb                  |  26 ++
 recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc   |   4 +
 ...urn-codes-for-copy-to-from-user-functions.patch | 398 +++++++++++++++++++++
 .../0022-fix-double-free-pkc-req-on-error.patch    |  26 ++
 ...023-remove-MAY_BACKLOG-flag-from-requests.patch |  69 ++++
 ...4-fix-COMPAT_CIOCKEY-ioctl-command-number.patch |  29 ++
 .../kernel-modules/kernel-module-ar_git.bb         |   2 +-
 .../kernel-modules/kernel-module-ceetm_git.bb      |  30 --
 .../kernel-modules/kernel-module-ipc.inc           |  13 +-
 .../kernel-module-qoriq-debug_git.bb               |  15 -
 recipes-kernel/linux/linux-qoriq.inc               |   8 +-
 recipes-kernel/linux/linux-qoriq_3.12.bb           |   4 +-
 .../pkc-host_git.bb}                               |  19 +-
 .../skmm-host_git.bb}                              |   6 +-
 44 files changed, 724 insertions(+), 343 deletions(-)
 delete mode 100644 recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
 delete mode 100644 recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
 delete mode 100644 recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/run-ptest
 rename recipes-kernel/{kernel-modules/kernel-module-asf_git.bb => asf/asf_git.bb} (71%)
 create mode 100644 recipes-kernel/ceetm/ceetm_git.bb
 create mode 100644 recipes-kernel/cryptodev/files/0021-check-return-codes-for-copy-to-from-user-functions.patch
 create mode 100644 recipes-kernel/cryptodev/files/0022-fix-double-free-pkc-req-on-error.patch
 create mode 100644 recipes-kernel/cryptodev/files/0023-remove-MAY_BACKLOG-flag-from-requests.patch
 create mode 100644 recipes-kernel/cryptodev/files/0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch
 delete mode 100644 recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb
 delete mode 100644 recipes-kernel/kernel-modules/kernel-module-qoriq-debug_git.bb
 rename recipes-kernel/{kernel-modules/kernel-module-pkc-host_git.bb => pkc-host/pkc-host_git.bb} (55%)
 rename recipes-kernel/{kernel-modules/kernel-module-skmm-host_git.bb => skmm-host/skmm-host_git.bb} (75%)

-- 
1.9.2

[PATCH 01/60] u-boot-qoriq: remove external-fsl reference

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

external-fsl should be standalone. Add the changes in its sperated layers.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index cc3d611..dfb698c 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 
 PV_append = "+fslgit"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
+DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
 DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
 DEPENDS_append_qoriq-ppc = " boot-format-native"
 
-- 
1.9.2

[PATCH 02/60] u-boot-qoirq: update to commit eb3d4fc

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commit imported:
eb3d4fc powerpc/mpc85xx: fix disable port for FMAN erratum A007273
63dfac1 powerpc/mpc85xx: restrict platform for FMAN erratum A007273
54e5fde powerpc/mpc85xx: Add workaround for FMAN erratum A007273
61ac6ba drivers:usb:fsl: Add affected SOCs for USB Erratum A007792
ced4086 fsl/ddr: updated ddr errata-A008378 for arm and power SoCs
17f724f fsl/errata: move fsl_errata.h to common directory
6acff65 arm: ls102x: add get_svr and IS_SVR_REV helper
0caf24c arm: ls102xa: Set fdt_high and initrd_high to the value of 0xffffffff
263a323 powerpc: e6500: Lock/unlock L2 cache instead of L1 as init_ram
f28fd70 powerpc: configs: Fix init_ram physical address for several boards
46be0a4 ls102xa: fdt: Disable IFC in SD boot for QSPI
f1ca68a ls102xa: etsec: Use proper settings for BE BDs
e0712fe mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition
a04b8b3 mmc: fsl_esdhc: fix mmc read/write error on T4160/T4080
23a735b arm: ls1021a: Fix the patch check warnings for the previous commit
5a42d5d SECURE_BOOT: Correct reading of ITS bit
f6310eb arm: ls1021a: Add QSPI or IFC support in SD boot
ab2db1a arm: ls102xa: fix patch check issue.
7611d2c Merge pull request #40 in SDK/u-boot-devel from ~B29983/u-boot-devel-tyt:feature/QUBOOT-1181-the-u-boot-deepsleep-resume-time to master
d406c4f arm: ls102xa: enable all the snoop signal for masters.
1686b84 Merge pull request #38 in SDK/u-boot-devel from ~B46683/u-boot-devel:bugfix/QUBOOT-1173-ls1021atwr-sd-boot-don-t-support to master
0258a33 Merge pull request #37 in SDK/u-boot-devel from ~B18965/my-u-boot-devel:master to master
dfc49e9 arm: ls1021atwr: optimize the deep sleep latency
2023326 Merge pull request #34 in SDK/u-boot-devel from ~B40530/u-boot-devel:feature/QUBOOT-789-sd-boot-on-t4-rdb to master
3a8f547 Merge pull request #35 in SDK/u-boot-devel from ~B47093/u-boot-devel-sdhc:feature/QLINUX-3755-support-the-uhs-speed-mode-for to master
e4957df Merge pull request #31 in SDK/u-boot-devel from DNNPI/ls1-uboot:feature/LS1-for-SDK1.9 to master
774b080 configs: ls1021atwr: Enable ID EEPROM for SD boot
95a9abb arm: mmu: Add missing volatile for reading SCTLR register
c9a7868 mmc: fsl_esdhc: enable EVDD automatic control for SD/MMC legacy card
3fe5a18 Merge pull request #27 in SDK/u-boot-devel from ~B45475/u-boot-devel-fork:feature/QUBOOT-1057-support-qe-tdm-on-t1040rdbd4 to master
767a4ad powerpc/t1040qds: enable peripheral clock for eSDHC
0867fed powerpc/t1040qds: enable adapter card type identification support
26d6853 mmc: fsl_esdhc: enable dat[4:7] for eMMC4.5
acd4c74 powerpc/t4rdb: Add SD boot support for T4240RDB board
b773c94 configs: ls1021atwr: Disable DSPI2 with NOR boot
98bf337 mtd: sf: Add support AT26DF081A chip
91bdf34 dm: dts: ls1021a-twr: Enable DSPI2 on LS1021ATWR
7289cb9 configs: ls1021atwr: Enable DSPI for LS1021ATWR
870af21 t1040d4rdb: assign muxed pins to qe-tdm when set hwconfig qe-tdm
300674e powerpc/t1023rdb: change default core frequency to 1200MHz
45f88eb powerpc/t1023rdb: eMMC boot without external SD card
aee4875 board/t1023rdb: add support for T1023RDB RevC
2c86026 ls1021atwr: sdboot: change serdes 0x20 to 0x30
8d38d25 LS102XA:workaround:disable priorities within DDR
2621445 arm: ls1021a: allow OCRAM access permission as R/W in SPL
10bc2b0 crypto/fsl: fix "era" property value on LE platforms
6d5733d arm: ls102xa: enable snooping for CAAM transactions
d3e6f11 Revert "Enable snooping on transactions from CAAM block"
a5dc0f7 arm: ls1021a: Ensure LS1021 ARM Generic Timer CompareValue Set 64-bit
0669b57 LS102XA: Workaround: DDR require a register write
449ab6a ls102xa: Enable snoop and DVM message requests.
6ae8810 Revert "arm: ls102xa: workaround for cache coherency problem"
617f1fd Revert "sf: Add support for flag status register on Micron chips"
18bd7bb arm: ls102xa: Add LE mode support for audio IPs on Rev2.0 silicon
80a22d8 QE: modify the address of qe ucode
784f7f2 arm: ls1021atwr: program the regulator for deep sleep
8971e50 ls1021atwr: added deep sleep support in uboot
9f692ae ls102xa: etsec: Enable Tx Data and TxBD snooping
79da560 arm/ls102xa:Add support of conditional workaround implementation as per SoC ver
b6876d0 arm: ls102xa: Adjust the load address of U-Boot for NOR boot

Remove the useless Fix-the-depend-race-issue.patch.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 ...5xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | 77 ----------------------
 .../u-boot/files/Fix-the-depend-race-issue.patch   | 38 -----------
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb         |  5 +-
 3 files changed, 2 insertions(+), 118 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
 delete mode 100644 recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch

diff --git a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
deleted file mode 100644
index e6b8d2e..0000000
--- a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001
-From: Zhenhua Luo <zhenhua.luo@freescale.com>
-Date: Mon, 9 Feb 2015 18:33:56 +0800
-Subject: [PATCH] u-boot/mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_
- definition
-
-In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in
-u-boot.lds overrides the linker built-in symbols
-(https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9),
-so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section.
-
-To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol
-should not be defined in sections, and the symbols in linker generated .got
-section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html).
-
-Fixed the following build errors with binutils-2.25:
-| powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got
-
-Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
----
- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds     | 1 -
- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 -
- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds      | 1 -
- arch/powerpc/cpu/mpc85xx/u-boot.lds          | 1 -
- 4 files changed, 4 deletions(-)
-
-diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
-index f933b21..0399f93 100644
---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
-+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
-@@ -44,7 +44,6 @@ SECTIONS
-     _GOT2_TABLE_ = .;
-     KEEP(*(.got2))
-     KEEP(*(.got))
--    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
-     _FIXUP_TABLE_ = .;
-     KEEP(*(.fixup))
-   }
-diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
-index b83c553..f044564 100644
---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
-+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
-@@ -22,7 +22,6 @@ SECTIONS
- 		_GOT2_TABLE_ = .;
- 		KEEP(*(.got2))
- 		KEEP(*(.got))
--		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
- 		_FIXUP_TABLE_ = .;
- 		KEEP(*(.fixup))
- 	}
-diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
-index 5ae7b3e..889a4c2 100644
---- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
-+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
-@@ -29,7 +29,6 @@ SECTIONS
- 		_GOT2_TABLE_ = .;
- 		KEEP(*(.got2))
- 		KEEP(*(.got))
--		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
- 		_FIXUP_TABLE_ = .;
- 		KEEP(*(.fixup))
- 	}
-diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
-index 2cf0b25..f15eaf3 100644
---- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
-+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
-@@ -50,7 +50,6 @@ SECTIONS
-     _GOT2_TABLE_ = .;
-     KEEP(*(.got2))
-     KEEP(*(.got))
--    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
-     _FIXUP_TABLE_ = .;
-     KEEP(*(.fixup))
-   }
--- 
-2.1.0
-
diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
deleted file mode 100644
index 1ddc667..0000000
--- a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-Status: Pending
-
-From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001
-From: Zhenhua Luo <zhenhua.luo@freescale.com>
-Date: Tue, 24 Sep 2013 00:54:40 -0500
-Subject: [PATCH] Fix the depend race issue
-
-| make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
-| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator.  Stop.
-| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
-| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2
-| make[2]: *** Waiting for unfinished jobs....
-
-Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
----
- spl/Makefile | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/spl/Makefile b/spl/Makefile
-index 6dbb105..3156d87 100644
---- a/spl/Makefile
-+++ b/spl/Makefile
-@@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS)))
- $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend
- 	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
- 
--depend:	$(obj).depend
-+# Explicitly make _depend in subdirs containing multiple targets to prevent
-+# parallel sub-makes creating .depend files simultaneously.
-+depend dep:	$(obj).depend
-+		for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \
-+			$(MAKE) -C $(SRCTREE)/$$dir _depend ; done
- .PHONY: depend
- 
- # defines $(obj).depend target
--- 
-1.8.2.1
-
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index dfb698c..6df1720 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -22,13 +22,12 @@ DEPENDS_append_qoriq-ppc = " boot-format-native"
 
 inherit deploy
 
-SRCBRANCH = "sdk-v1.8.x"
+SRCBRANCH = "sdk-v1.9.x"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \
-    file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch \
     file://gcc5.patch \
     file://add-fgnu89-inline-option-for-gcc5.patch \
 "
-SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
+SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3"
 
 python () {
     if d.getVar("TCMODE", True) == "external-fsl":
-- 
1.9.2

[PATCH 03/60] u-boot-qoriq: exit if UBOOT_CONFIG not supported

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index 6df1720..e86bc7c 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -57,14 +57,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 
 do_compile_append_qoriq-ppc() {
-    python ./tools/genboardscfg.py
-
     for board in ${UBOOT_MACHINE}; do
-        if ! grep -wq $board ${S}/boards.cfg;then
-            echo "WARNING: $board not supported in boards.cfg"
-            continue
-        fi
-
         case "${board}" in
             *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
             *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
@@ -124,10 +117,6 @@ unset i j
 
 do_install_append_qoriq-ppc() {
     for board in ${UBOOT_MACHINE}; do
-        if ! grep -wq $board ${S}/boards.cfg;then
-            continue
-        fi
-
         case "${board}" in
             *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
             *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
@@ -150,10 +139,6 @@ do_deploy_append_qoriq-ppc() {
     fi
 
     for board in ${UBOOT_MACHINES}; do
-        if ! grep -wq $board ${S}/boards.cfg;then
-            continue
-        fi
-
         case "${board}" in
             *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
             *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
-- 
1.9.2

[PATCH 04/60] u-boot-qoriq: fix indent

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index e86bc7c..56fd692 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -92,26 +92,26 @@ do_compile_append_qoriq-ppc() {
 }
 
 do_compile_append_qoriq-arm () {
-unset i j                                                                                                                       
+    unset i j
     if [ "x${UBOOT_CONFIG}" != "x" ]; 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
-                     case "${config}" in
-                         *nand* | *sdcard*)
-                             cp ${config}/u-boot-with-spl-pbl.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};;
-                         *spi*) 
-                             tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${config}/u-boot-dtb.bin ${config}/u-boot.swap.bin 8
-                             cp ${config}/u-boot.swap.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};;
-                     esac
-                 fi
-             done
-             unset j
-         done
-         unset i
-     fi
+        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
+                    case "${config}" in
+                        *nand* | *sdcard*)
+                            cp ${config}/u-boot-with-spl-pbl.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};;
+                        *spi*) 
+                            tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${config}/u-boot-dtb.bin ${config}/u-boot.swap.bin 8
+                            cp ${config}/u-boot.swap.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};;
+                    esac
+                fi
+            done
+            unset j
+        done
+        unset i
+    fi
 }
 
 
-- 
1.9.2

[PATCH 05/60] u-boot-qoriq: avoid changing building directory

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index 56fd692..73a1fdf 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -150,10 +150,8 @@ do_deploy_append_qoriq-ppc() {
         if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
             mkdir -p ${DEPLOYDIR}
             install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
-
-            cd ${DEPLOYDIR}
-            rm -f ${UBOOT_TARGET}-${board}.bin
-            ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
+            rm -f ${DEPLOYDIR}/${UBOOT_TARGET}-${board}.bin
+            ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}.bin
         fi
     done
 }
-- 
1.9.2

[PATCH 06/60] linux-qoriq: update to commit 43cecda

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
43cecda fmd: remove cc-aging support
867551d fmd: relocate aging_support field to maintain compatibility
08d3161 Merge pull request #75 in SDK/linux-devel from ~R52568/linux-devel:hotfix/QLINUX-3938-fmd-ioc_compat_fm_pcd_kg_scheme_spc_t to master
1cf7b57 fmd: PCD: fix offline port blocked by fragmented IPV6
295abbb fmd: move compat_copy_fm_pcd_kg_scheme_spc out of DPAA 11 def
976b0aa fmd: PCD: fix offline port blocked by fragmented IPV6
b242e9c fmd: Add support for IPF after HMan
fd8e7c7 Merge pull request #69 in SDK/linux-devel from ~R27762/linux-devel:add_hm_node_stats to master
1c291fd Merge pull request #72 in SDK/linux-devel from ~B56421/linux-devel_sdk_ip-usb:bugfix/QSDK-2454 to master
50eea51 Merge pull request #48 in SDK/linux-devel from ~R52568/linux-devel:bugfix/QLINUX-3822-monitoring-any-match-inside-hash to master
dd05648 arm: dts: ls1021a: Add dma-coherent property to usb3 node
e8c288e drivers: dwc3: Set dma ops for xhci dev
56afee9 drivers: dwc3 : Add support for USB snooping
3f83306 drivers: dwc3: host: Change burst beat and outstanding pipelined transfers requests.
1666d68 fmd: add ioctl call to retrieve scheme counter - spc
a9d0ea5 fmd: Render header manip node statistics available in user space
e176e3f fmd: fix compat layer for aging_support
3a8d082 Merge pull request #65 in SDK/linux-devel from ~R01356/linux-devel:bugfix/QUSDPA-704-segfault-in-dma_mem-allocator.c to master
a57ffba Merge pull request #64 in SDK/linux-devel from ~B06830/linux-devel:bugfix/QSDK-2404-cryptodev-linux-sha1-offloading to master
0586472 Merge pull request #63 in SDK/linux-devel from ~B29983/linux-devel-tyt:QSDK-2438-there-is-some-improper-information to master
61f0e11 Merge pull request #61 in SDK/linux-devel from ~R54964/linux-devel:bug-fix to master
cfb981f dev-exporting dev functions to support ceetm
e98f36e fsl_usdpaa: Remove TLB entries when unmapping memory
8700bab crypto: caam - Change kmalloc to kzalloc to avoid residual data
4fd8cac crypto: caam - fix memory corruption in ahash_final_ctx
16d4087 crypto: caam - Fix incorrect size when DMA unmapping buffer
270c770 crypto: caam - improve initalization for context state saves
67ef9d13 crypto: caam - enable LARGE_BURST for enhancing DMA transactions size
2c27666 crypto: caam - make write transactions bufferable on PPC platforms
418316c cpufreq: qoriq: fix output information error
300c3ff fsl-qbman: Handle memory leaks
56e16e2 fsl-pme: Check for null pointers
3ac31aa fsl-dce: Handle memory allocation failures
e11b65b fsl-dce: Correct error paths and add new labels
ea1259d fsl_qbman: null check for lni in qman_ceemt_sp_release
e82a761 fmd: fix locks in ModifyKey function
dedb4b3 fmd: support aging in CC
0506053 pci/layerscape: Do not check link status
e03bbdd asf_tcp_nf: Patch to correct typecast in tcp timestamp copy.
91aade9 Revert "gianfar: Add dma transfer endian property support"
03dd666 kconfig-asf : asf_qos disabled with asf by default
b8d41cb dev-asf-qos - correcting the qos hooks for dpaa linux qos
18b0779 dpaa_eth: fix bpool seeding for advanced drivers
7faf498 net, gianfar, rt: Update TX_TIMEOUT to 5HZ
502650e net, rt: limit net_rx napi calls in threaded ISR context
e37ce25 powerpc/t1040/dts: Add interrupts for PHYs connected to L2 Switch ports
6da728b fmd: support aging in CC
5cd3a8f fmd: fix policer spelling issues
b5d9899 fmd: Remove FM_PORT_PcdPrsModifyStartOffset routine - not supported
4c642e7 fsl_qbman: enable sending cscn to dcp for old qman revision
b8887bd t4240dts: correct the ceetm node
f33567a dpaa_eth: Add a configurable dpa_tx call
e48b858 mmc: sdhci-of-esdhc: fix compile error on ARM platform
fb9a06b QorIQ/TMU: add TMU node to device tree for QorIQ T1023/T1024
4fbd4cf QorIQ/TMU: add thermal management support based on TMU
a9463a3 QorIQ/TMU: add TMU node to device tree for QorIQ T1040/T1042
6b43e2b thermal: fix cpu_cooling max_level behavior
f0a70b9 mmc: sdhci-of-esdhc: add SDR50 mode support for SD/MMC Legacy Adapter Card
9ac6075 mmc: esdhc: add eMMC45 Adapter Card HS200 mode support
e89634e QorIQ/TMU: add TMU node to device tree for LS1021A
fd1b282 Merge branch 'feature/LS1-for-SDK' of ssh://sw-stash.freescale.net/dnnpi/ls1-linux-jason into LS1-SDKV04-SDK1.9
8d3a3ca t104xd4rdb: add DS26522 nodes to device tree
aaa395f Merge branch 'qoriq-sdk' into LS1-SDK-Rev2.0
ec78b41 arm: ls1021a: mask interrupts before entering deep sleep
13d0daf arm: dts: ls1021a: Add transfer mode property in DSPI2 node
6f50fc1 arm: dts: ls1021atwr: Enable DSPI2 dts node
7a6dba4 arm: ls1021a: change the order of setting PMC interrupt registers
4e61417 crypto: caam - fix SEC ERA reading
bcd5862 crypto: caam - fix snooping for write transactions
eec616d1 arm/dts: Add node for ina220 on LS1021ATWR-Rev
3915d65 arm/defconfig: Add Atheros AT803X PHYs support
e364aa2 QE/HDLC: modify QE-HDLC for both ARM and POWERPC
bb21962 Test patch: Enable CAN SoC level loopback
a4c59bc arm/dts: Add nodes for flexcan devices present on LS1021A-Rev2 SoC
6e9c5a3 can: flexcan: Add support for non RX-FIFO mode
c466de8 can: flexcan: Remodel FlexCAN register r/w APIs for BE instances
306f67c can: flexcan: Add ls1021a flexcan device entry
7e71163d doc/bindings: Add 'endianess' optional-property for FlexCAN controller
1795472 Revert 'can: flexcan: Add ls1021a flexcan device entry'
863d717 Revert 'net: can: Remodel FlexCAN register read/write APIs for BE instances'
41cfacd Revert 'can: flexcan: Add support for non RX-FIFO mode and conditional ERRATA ERR005829 handling'
8d04086 mmc: sdhci: more efficient interrupt enable register handling
e08d8bf pci/layerscape: update MSI code for ls1021 rev2 MSI support
d217d96 mmc: sdhci-pltfm: enable interrupt mode to detect card
7549302 arm: ls1021a: enable sleep and deep sleep for rev 2.0 silicon
3aa9846 ls1021a: dts: Add eTSEC info for 2nd interrupt groups
5217966 Merge branch 'qoriq-sdk' into LS1-SDK-Rev2.0
02d571e ls102xa: nor: Adjust the partition for NOR flash according to the new mapping table
78fd893 arm: ls1021a: add deep sleep support on TWR-LS1021A-PB
b65882a Revert "gianfar: Disable Rx snooping for LS1"
138b929 Revert "gianfar: Remove tx snooping support from LS1"
7b56cb1 arm: ls1021a: add platform notifier for dma-coherent requirement
62a2834 ls102xa: dts: Remove big-endian-regs property for SAI
bebea77 Revert "ls102xa: audio: Workaround for SAI data transfer endian issue"
a449b22 ls102xa: nor: Adjust the partition for NOR flash

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

diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb
index 23a2e00..0e6b8ab 100644
--- a/recipes-kernel/linux/linux-qoriq_3.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_3.12.bb
@@ -1,6 +1,6 @@
 require recipes-kernel/linux/linux-qoriq.inc
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \
     file://modify-defconfig-t1040-nr-cpus.patch \
     file://net-sctp-CVE-2014-0101.patch \
     file://0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
@@ -9,4 +9,4 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \
     file://0001-powerpc-Align-TOC-to-256-bytes.patch \
 "
 
-SRCREV = "f488de6741d5ba805b9fe813d2ddf32368d3a888"
+SRCREV = "43cecda943a6c40a833b588801b0929e8bd48813"
-- 
1.9.2

[PATCH 07/60] linux-qoriq: save the merged .config as ${WORKDIR}/defconfig

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

In fsl-kernel-localversion.bbclass, ${B}/.config will be regenerated
based on ${WORKDIR}/defconfig. Save the merged .config to avoid issue.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-kernel/linux/linux-qoriq.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 6c925de..950c08c 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -23,8 +23,7 @@ DELTA_KERNEL_DEFCONFIG ?= ""
 
 do_configure_prepend() {
     # copy desired defconfig so we pick it up for the real kernel_do_configure
-    cp ${KERNEL_DEFCONFIG} ${B}/.config
-    cp ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig
+    cp ${KERNEL_DEFCONFIG} .config
     # add config fragments
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f "${deltacfg}" ]; then
@@ -34,7 +33,7 @@ do_configure_prepend() {
                 ${S}/arch/powerpc/configs/${deltacfg}
         fi
     done
-
+    cp .config ${WORKDIR}/defconfig
 }
 
 do_install_append_qoriq-arm() {
-- 
1.9.2

[PATCH 08/60] linux-qoriq: update LOCALVERSION

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Don't set LOCALVERSION options in .config as this will result in version
mismatch between uImage and kernel modules which packaged in rootfs.

This happens when using uImage built standalone toolchain + rootfs built
by Yocto.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-kernel/linux/linux-qoriq.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 950c08c..5992fbf 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -19,6 +19,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
 
 SCMVERSION ?= "y"
+LOCALVERSION = ""
 DELTA_KERNEL_DEFCONFIG ?= ""
 
 do_configure_prepend() {
-- 
1.9.2

[PATCH 09/60] linux-qoriq: support kernel delta defconfig managed in recipe folder

[ting.liu]

From: Zhenhua Luo <zhenhua.luo@freescale.com>

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 recipes-kernel/linux/linux-qoriq.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 5992fbf..6436d9c 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -29,6 +29,8 @@ do_configure_prepend() {
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f "${deltacfg}" ]; then
             ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+        elif [ -f "${WORKDIR}/${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
         elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
             ${S}/scripts/kconfig/merge_config.sh -m .config \
                 ${S}/arch/powerpc/configs/${deltacfg}
-- 
1.9.2

[PATCH 10/60] t1023rdb: build nor u-boot

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1023rdb.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index 7b512ba..556a9e5 100644
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -9,9 +9,10 @@ require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1023"
 
-UBOOT_CONFIG ??= "nand sdcard spi"
-UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
+UBOOT_CONFIG[nor] = "T1023RDB_config"
+UBOOT_CONFIG[nand] = "T1023RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
 
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
-- 
1.9.2

[PATCH 11/60] t1023rdb-64b: build nor u-boot

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1023rdb-64b.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index 5f6f61f..c536d7a 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -9,9 +9,10 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1023"
 
-UBOOT_CONFIG ??= "nand sdcard spi"
-UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
+UBOOT_CONFIG[nor] = "T1023RDB_config"
+UBOOT_CONFIG[nand] = "T1023RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
 
 UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-- 
1.9.2

[PATCH 12/60] b4860qds-64b: remove UBOOT_MACHINES setting

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/b4860qds-64b.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 5df5e78..5a85f8d 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -9,7 +9,6 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
 UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
-- 
1.9.2

[PATCH 13/60] t4160qds: build secure-boot u-boot

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

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

diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index e86cbd2..49f5620 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4160"
 
-UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4160QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
 
-- 
1.9.2

[PATCH 14/60] ls1021atwr: support QSPI and IFC in SD boot

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

QSPI and IFC are both supported in SD boot. Build two SD boot images,
one supports IFC; the other supports QSPI.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/ls1021atwr.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 8a6dd49..eb03563 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -2,7 +2,7 @@
 #@NAME: Freescale LS1021ATWR board
 #@SOC: ls102xa
 #@DESCRIPTION: Machine configuration for Freescale QorIQ LS1 Tower System
-#              Module Rev1.0 with ARM Cortex-A7 core
+#              Module Rev2.0 with ARM Cortex-A7 core
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
 
 require conf/machine/include/qoriq-arm.inc
@@ -10,9 +10,10 @@ require conf/machine/include/tune-cortexa7.inc
 
 SOC_FAMILY = "ls102xa"
 
-UBOOT_CONFIG ??= "nor sdcard lpuart qspi"
+UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
 UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
-UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
+UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config"
+UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config"
 UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config"
 UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config"
 UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
-- 
1.9.2

[PATCH 15/60] t1040d4rdb: build usdpaa/usdpaa-shared-interfaces dtb

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1040d4rdb.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index d4b4aef..2c21d52 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -22,7 +22,9 @@ UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
+KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
+    t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
+"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-- 
1.9.2

[PATCH 16/60] t1040d4rdb-64b: build usdpaa/usdpaa-shared-interfaces dtb

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1040d4rdb-64b.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 9ce616d..f4b25f9 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -22,7 +22,9 @@ UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
+KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
+    t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
+"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-- 
1.9.2

[PATCH 17/60] t1042d4rdb: build usdpaa/usdpaa-shared-interfaces dtb

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1042d4rdb.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 3d6d2c8..fd5c528 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -22,7 +22,9 @@ UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
+KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
+    t1042d4rdb-usdpaa-shared-interfaces.dtb \
+"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-- 
1.9.2

[PATCH 18/60] t1042d4rdb-64b: build usdpaa/usdpaa-shared-interfaces dtb

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 conf/machine/t1042d4rdb-64b.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 25b7eac..59c0cd9 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -22,7 +22,9 @@ UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
+KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
+    t1042d4rdb-usdpaa-shared-interfaces.dtb \
+"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-- 
1.9.2

[PATCH 19/60] ar: update COMPATIBLE_MACHINE for t104x

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

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

diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 0cfbddf..08c35c6 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -27,4 +27,4 @@ do_install(){
 
 FILES_${PN} += "${bindir}/"
 
-COMPATIBLE_MACHINE = "(t1040rdb|t1040rdb-64b|t1042rdb|t1042rdb-64b|t1042rdb-pi|t1042rdb-pi-64b)"
+COMPATIBLE_MACHINE = "(t1040|t1042)"
-- 
1.9.2

[PATCH 20/60] ceetm: update COMPATIBLE_MACHINE for t104x

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb b/recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb
index 5d89531..7009b2d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb
@@ -27,4 +27,4 @@ do_install(){
 FILES_${PN} += "/usr/driver/ceetm ${libdir}/tc"
 INHIBIT_PACKAGE_STRIP = "1"
 
-COMPATIBLE_MACHINE = "(e6500-64b|t1040rdb|t1040rdb-64b|t1042rdb|t1042rdb-64b)"
+COMPATIBLE_MACHINE = "(e6500-64b|t1040|t1042)"
-- 
1.9.2

[PATCH 21/60] kernel-module-ceetm: rename back to ceetm

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

ceetm ships not only ceetm.ko, but also q_ceetm.so. Rename back to
ceetm

As the recipe inherits module.bbclass, kernel-module-ceetm will be
created to package ceetm.ko if it is installed into /lib/modules/.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 .../{kernel-modules/kernel-module-ceetm_git.bb => ceetm/ceetm_git.bb}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-kernel/{kernel-modules/kernel-module-ceetm_git.bb => ceetm/ceetm_git.bb} (100%)

diff --git a/recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
similarity index 100%
rename from recipes-kernel/kernel-modules/kernel-module-ceetm_git.bb
rename to recipes-kernel/ceetm/ceetm_git.bb
-- 
1.9.2

[PATCH 22/60] ceetm: update to commit 2c79d0b

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
2c79d0b ceetm: asf dummy packet hook in ceetm
179d761 ceetm: improved error handling
ceb2646 ceetm: Adding support for vlan and large packets
83243fd ceetm: use the extended dpa_tx call from dpaa
6126e29 ceetm: set the fq context_a for buffer recycling
4cbb1ba Revert "Avoid crash on incorrect classid result with classifier"
aaa61ff Revert "ceetm: redefine the print_rate function"
c2de120 Makefile: use KBUILD_OUTPUT to point to build-artifacts
b000e91 Avoid crash on incorrect classid result with classifier
2242e7a ceetm: redefine the print_rate function

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

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 7009b2d..2c91ffb 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 
 inherit module qoriq_build_64bit_kernel
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1"
-SRCREV =  "ecf55c9ca0cd42a212653e1f99c19cd611e3a008"
+SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;branch=sdk-v1.9.x"
+SRCREV = "2c79d0b3465368a19bb2b4ccd680ddd297ebe377"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 23/60] ceetm: remove useless do_configure_preappend

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

The fix was merged in source code now.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/ceetm/ceetm_git.bb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 2c91ffb..2d48319 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -13,10 +13,6 @@ EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
 export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
-do_configure_prepend () {
-    sed -i 's,$(KERNEL_PATH)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/ceetm_module/Makefile
-}
-
 do_install(){
 	mkdir -p ${D}/usr/driver/ceetm
 	mkdir -p ${D}/${libdir}/tc
-- 
1.9.2

[PATCH 24/60] ceetm: install ceetm.ko into /lib/modules/

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

kernel-module-ceetm will be created to package ceetm.ko by default.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/ceetm/ceetm_git.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 2d48319..228dadd 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -14,13 +14,13 @@ export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_install(){
-	mkdir -p ${D}/usr/driver/ceetm
-	mkdir -p ${D}/${libdir}/tc
-	cp ${S}/bin/ceetm.ko ${D}/usr/driver/ceetm
-	cp ${S}/bin/q_ceetm.so ${D}/${libdir}/tc/.
+    install -d ${D}/lib/modules/${KERNEL_VERSION}/extra
+    mkdir -p ${D}/${libdir}/tc
+    install -m 644 ${S}/bin/ceetm.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/
+    cp ${S}/bin/q_ceetm.so ${D}/${libdir}/tc/
 }
 
-FILES_${PN} += "/usr/driver/ceetm ${libdir}/tc"
+FILES_${PN} += "${libdir}/tc"
 INHIBIT_PACKAGE_STRIP = "1"
 
 COMPATIBLE_MACHINE = "(e6500-64b|t1040|t1042)"
-- 
1.9.2

[PATCH 25/60] skmm-ep: add ARCH in EXTRA_OEMAKE

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

ARCH is needed for all tasks, for example, make clean

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-extended/skmm-ep/skmm-ep_git.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 79ef450..13d4c08 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -15,18 +15,17 @@ SRCREV = "27156a6621c8f6d7f98210b1ca5cd97bde926875"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = 'MACHINE=${MACHINE}'
+EXTRA_OEMAKE = 'ARCH=${TARGET_ARCH} MACHINE=${MACHINE}'
 
 export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`"
 export LIBEDIT_LDFLAGS = "`pkg-config --libs --static libedit`"
 
 do_compile () {
-	export ARCH=${TARGET_ARCH}
 	oe_runmake
 }
 
 do_install () {
-	oe_runmake ARCH=${TARGET_ARCH} install DESTDIR=${D}
+	oe_runmake install DESTDIR=${D}
 }
 
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)"
-- 
1.9.2

[PATCH 26/60] kernel-module-skmm-host: rename back to skmm-host

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

skmm-host ships not only .ko files, but also skmm_crypto.cfg/c29x_skmm_perf_profile.sh

As the recipe inherits module.bbclass, kernel-module-* will be
created to package .ko if installed into /lib/modules/.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 .../kernel-module-skmm-host_git.bb => skmm-host/skmm-host_git.bb}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-kernel/{kernel-modules/kernel-module-skmm-host_git.bb => skmm-host/skmm-host_git.bb} (100%)

diff --git a/recipes-kernel/kernel-modules/kernel-module-skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
similarity index 100%
rename from recipes-kernel/kernel-modules/kernel-module-skmm-host_git.bb
rename to recipes-kernel/skmm-host/skmm-host_git.bb
-- 
1.9.2

[PATCH 27/60] skmm-host: update to commit 41a448d

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
41a448d fix dequeueing problem for dsa sign-verify test
290790a proper buffer cleanup for dsa sign-verify test
c4d8129 rename variable to better reflect its purpose
1e555ae remove unnecessary else branches
ddddb78 clean-up code flow
dec7b96 fix memory clean-up on error path
59e5746 remove redundant variables initialization
60431a8 remove dead code
3badec6 set default file paths to where we install them
6b23ee3 add more rules to .gitignore
b03ff68 remove unnecessary function call
86c1b1d remove cascade of defined and not used variables
8344196 remove dead code
faa9cbe fix typos - probably from copy/paste

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

diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index 0241263..d09136c 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=99803d8e9a595c0bdb45ca710f353813"
 
 inherit  module qoriq_build_64bit_kernel
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1"
-SRCREV = "a655c571a92f4a5d6ced09869c2f17609ee47361"
+SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;branch=sdk-v1.9.x"
+SRCREV = "41a448d40c68c66c33aea20108672448483be2d8"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
 FILES_${PN} += "/etc/skmm/ /usr/bin/"
-
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds)"
+CLEANBROKEN = "1"
-- 
1.9.2

[PATCH 28/60] apptrk: update to commit 4216af3

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
4216af3 Fix stepping over branch instructions in Thumb
59524e6 Error while reading CPSR
712a099 PowerPC Support for hardware breakpoints and watchpoints
c7c4b2b Incorrect mode (thumb/arm) after exec()
4e962d4 Thumb support for ARMv7
fd94e7f Fix TrkHandleExecEvent for ARMv7
50e2180 Invalidate traced breakpoint after release in TargetCleanupTrace for PA
18f4450 Fix crash when running a 32bit threaded application on a 64bit AppTrk

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-bsp/apptrk/apptrk_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/apptrk/apptrk_git.bb b/recipes-bsp/apptrk/apptrk_git.bb
index 6cb8cfc..38b700f 100644
--- a/recipes-bsp/apptrk/apptrk_git.bb
+++ b/recipes-bsp/apptrk/apptrk_git.bb
@@ -7,11 +7,11 @@ DEPENDS = "elfutils"
 
 inherit kernel-arch
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/apptrk.git;nobranch=1 \
+SRC_URI = "git://git.freescale.com/ppc/sdk/apptrk.git;branch=sdk-v1.9.x \
     file://apptrk-install-create-all-components-of-DEST.patch \
     file://no-strip.patch \
 "
-SRCREV = "cbed10997c5e2a4aaa004fb0e1efec858bf1bbe1"
+SRCREV = "4216af328452ed25a557759715a2087986a5a4bd"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 29/60] rcw: swap qspi binary in do_install_append

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 ...ake-BOARDS-DESTDIR-overidable-in-Makefile.patch | 57 ----------------------
 recipes-bsp/rcw/rcw_git.bb                         | 10 ++--
 2 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch

diff --git a/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch b/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
deleted file mode 100644
index 49d99fc..0000000
--- a/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f2e796c903b2a3f81dbd38da3dc087cb7539d307 Mon Sep 17 00:00:00 2001
-From: Zhenhua Luo <zhenhua.luo@freescale.com>
-Date: Wed, 3 Sep 2014 03:03:42 -0500
-Subject: [PATCH] Makefile: make BOARDS/DESTDIR overidable and add endian
- switch
-
-1. For one specific board, no need to build the rcw for all supported
-   targets, make BOARDS and DESTDIR overridable to achieve this.
-2. Add the endian swap for qspiboot rcw
-
-Upstream-Status: Pending
-
-Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
----
- Makefile     |    4 ++--
- Makefile.inc |    9 +++++++--
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6ec1697..0f94293 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
--DESTDIR = .
--BOARDS = b4420qds b4860qds \
-+DESTDIR ?= .
-+BOARDS ?= b4420qds b4860qds \
- 	 ls1021aqds ls1021atwr \
- 	 p2041rdb p3041ds p4080ds p5020ds p5040ds \
- 	 t1024qds t1023rdb t1024rdb t1040rdb t1042rdb t1042rdb_pi t1040qds \
-diff --git a/Makefile.inc b/Makefile.inc
-index 4cadb2e..6e8b78f 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -1,4 +1,4 @@
--DESTDIR = .
-+DESTDIR ?= .
- INSTALL = install
- PYTHON ?= python2
- RCW = $(PYTHON) ../rcw.py
-@@ -18,7 +18,12 @@ all: $(targets)
- install: $(targets)
- 	$(INSTALL) -d $(DESTDIR)
- 	@for file in $^; do \
--		$(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \
-+		case $$file in \
-+			*qspiboot*) file_swap="`echo $$file | sed -e 's/qspiboot/qspiboot_swap/'`"; \
-+						tclsh byte_swap.tcl $$file $$file_swap 8 ; \
-+						$(INSTALL) -m 644 -D $$file_swap $(DESTDIR)/$$file_swap ;; \
-+			*) $(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \
-+        esac \
- 	done
- 	$(INSTALL) -m 644 -D README $(DESTDIR)
- 
--- 
-1.7.9.7
-
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 016ef82..0647c2c 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -9,9 +9,7 @@ inherit deploy
 
 SRCBRANCH = "master"
 SRCREV = "426f7a6535d93dac76f5125035e0938a85e778d2"
-SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH} \
-    file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \
-"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
@@ -20,6 +18,12 @@ EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=
 do_install () {
     oe_runmake install
 }
+do_install_append_ls102xa () {
+    for f in `find ${D}/boot/rcw/ -name "*qspiboot*"`;do
+        f_swap=`echo $f |sed -e 's/qspiboot/qspiboot_swap/'`
+        tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl $f $f_swap 8
+    done
+}
 
 do_deploy () {
     install -d ${DEPLOYDIR}/rcw
-- 
1.9.2

[PATCH 30/60] rcw: update to commit 521008f

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
521008f t1023rdb: RCW's added for Secure Boot
9e7c9d9 t1040qds: rcw: Add SD card SDR mode RCW
7467e6e t1040qds: rcw: set HWA_CGA_M1_CLK_SEL to 1
07af33e t2080qds: rcw: Add eMMC HS200 mode RCW
57fd2c9 t1040qds: rcw: Add eMMC HS200 mode RCW
e0b2272 arm: ls1021atwr: fix a bug change serdes to 0x30
795e6e7 arm: ls1021atwr: remove rcw for serdes 0x20
553eff7 arm: ls1021atwr: Change serdes 0x20 to 0x30
8847c6d arm: ls1021atwr: Add rcw for serdes 0x30 support
988d1ca arm: ls1021atwr: Enable Audio and HDMI for 0x70
1d4f34e arm: ls1021atwr: Enable DSPI2 when boot from QSPI and NOR
690613a arm: ls102xa: update PBI for PCIe and SCFG
27642c2 arm: ls102xa: Adjust the PBI command about the load address of U-Boot for NOR boot

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

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 0647c2c..91ee9d5 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -7,9 +7,8 @@ DEPENDS += "change-file-endianess-native"
 
 inherit deploy
 
-SRCBRANCH = "master"
-SRCREV = "426f7a6535d93dac76f5125035e0938a85e778d2"
-SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH}"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=sdk-v1.9.x"
+SRCREV = "521008fe6ec9897fe245e1c1241fc27dad98f24d"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 31/60] rcw: update COMPATIBLE_MACHINE as qoriq

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-bsp/rcw/rcw_git.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 91ee9d5..9be53f2 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -33,7 +33,5 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-ALLOW_EMPTY_${PN} = "1"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls102xa|qoriq-ppc)"
+COMPATIBLE_MACHINE = "(qoriq)"
-- 
1.9.2

[PATCH 32/60] pkc-firmware: update to commmit 32804a0

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
32804a0 note on global variable definition
29a0bcb rename variable "p_cursor" and make it global
48e9ab1 remove unnecessary "l2_cursor" variable
a15c204 add -Wall and -Werror to build options
fa58ed6 fix typo regarding the use of "struct sec_jr_regs"
8fcd0bc enable large bursts for DECO transactions
ca35ed5 refactor code for masking interrupts from SEC
3e36d4f refactor code for setting SEC pointer size
8a7f971 remove unneeded commented "print_debug()"
c73303d move defines at the start of the file
afcfd66 remove commented (#if 0) code
32d119a remove unnecessary type definition "kek_regs_t"
4d99599 remove unnecessary type definition "rng_regs_t"
d7e65e5 refactor: added defines for better consistency
21a4853 refactor: move defines at the start of the file
baa8a25 remove unnecessary type definition "sec_jr_regs_t"
df0dd86 remove unnecessary type definition "sec_op_ring_t"
f70c14f remove unnecessary type definition "sec_ip_ring_t"
11ed223 remove unnecessary type definition "sec_jr_t"
ba47de3 remove unnecessary commented instruction
b9063e4 remove unnecessary type definition "sec_engine_t"
620cf5f remove unnecessary type definition "resource_t"
bef6960 remove not used function
c4a078e fix incorrect handling of multiple rings
92c6b71 c2x0_boot_loader/u-boot.lds: remove _GLOBAL_OFFSET_TABLE_ definition
453eaa9 use a logical definition for MIN
570aadd rearrange code and remove leftovers after IRQ fix patch
2f31558 rename variable to better match its purpose
029cc82 remove artificial SEC dequeue and enqueue throttling
b6fe293 use a bigger type for req_mem_size
e22d91f fix incorrect IRQ signalling to host
692981c remove not unused #define
7e2fbd4 remove redundant c_mem_layout_t typedef
377daaa remove redundant fsl_h_mem_handshake_t typedef
52f75d0 remove redundant crypto_c_hs_mem_t typedef
f126673 use smaller type for index
8c8f4ec refactoring: fix reference to the upper half of the L2 SRAM
0092a57 refactoring: remove inner code blocks
6853157 clean-up whitespace and debug-print output
c3720dd refactoring hs: extract hs_complete
3677b1c refactoring hs: extract fw_init_ring_pair
78ea81b refactoring hs: extract fw init config
cc416c2 minor fixes in code layout
0076df7 fix typos and clarify comments
0ab33aa remove unused variable
17607d2 use positive logic in conditional code
5d3886f Merge pull request #2 in SDK/pkc-firmware from bugfix/QSDK-2327-pkc-host-driver-does-not-insert to master
c0256e0 clean-up whitespace and indentation in uboot_print.c
8f5be56 fix compiler warnings on static declarations
f3bc222 use a no-op printf when PRINT_DEBUG is disabled
541a7ed make void the function c2x0_serial_init
8ecba2c enable debug prints from config.mk and move definitions to uboot_print.h
9ef2eb5 remove conditional for always-on code
bd52b94 update build instructions
d872219 refactoring: resetdev: extract code blocks into readable functions
f5301c1 remove unused variables
0931e3b refactoring: move defines out of the function for clarity
040cb61 refactoring: secstat: extract code blocks into readable functions
77fa0e1 refactoring: pingdev: extract code blocks into readable functions
91bf581 refactoring: ringstat: extract code blocks into readable functions
7559c79 refactoring: devstat: extract code blocks into readable functions
af9d455 refactoring: resetsec: extract code blocks into readable functions
17b0905 refactoring: debug: extract code blocks into readable functions
09fa9a8 remove not-used variable
ae691e8 whitespace clean-up
3e6700e update build instructions

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

diff --git a/recipes-bsp/pkc-firmware/pkc-firmware_git.bb b/recipes-bsp/pkc-firmware/pkc-firmware_git.bb
index 3cc5d44..48a83cd 100644
--- a/recipes-bsp/pkc-firmware/pkc-firmware_git.bb
+++ b/recipes-bsp/pkc-firmware/pkc-firmware_git.bb
@@ -10,8 +10,8 @@ inherit deploy
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-firmware.git;nobranch=1"
-SRCREV = "b891873c1eea7a7d53f9472ea601712897cb17b7"
+SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-firmware.git;branch=sdk-v1.9.x"
+SRCREV = "32804a0d5d763b4ccc72dcd97969dc5adc14c2f9"
 
 S = "${WORKDIR}/git"
 
@@ -38,4 +38,4 @@ addtask deploy after do_install
 
 FILES_{PN} += "/etc/crypto/pkc-firmware.bin"
 COMPATIBLE_MACHINE = "(c293pcie)"
-
+CLEANBROKEN = "1"
-- 
1.9.2

[PATCH 33/60] kernel-module-pkc-host: rename back to pkc-host

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

pkc-host ships not only .ko files, but also crypto.cfg/pkc-firmware.bin/etc.

As the recipe inherits module.bbclass, kernel-module-* will be
created to package .ko if installed into /lib/modules/.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 .../kernel-module-pkc-host_git.bb => pkc-host/pkc-host_git.bb}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-kernel/{kernel-modules/kernel-module-pkc-host_git.bb => pkc-host/pkc-host_git.bb} (100%)

diff --git a/recipes-kernel/kernel-modules/kernel-module-pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
similarity index 100%
rename from recipes-kernel/kernel-modules/kernel-module-pkc-host_git.bb
rename to recipes-kernel/pkc-host/pkc-host_git.bb
-- 
1.9.2

[PATCH 34/60] pkc-host: update to commit 26df0a3

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
26df0a3 fix references to dsa sign, verify and keygen buffers
3d11a8b remove obvious comments in dsa.c
e04defa fix ecdsa-sign test
60a16b2 fix ecdsa-verify test
ffaf905 fix ecdsa verify descriptor
7fab9ff remove redundant global variables in ecdsa_test.c
fefdadb clarify assignments in dsa_keygen_init_crypto_mem
12c1e53 avoid redundant typecasts when accessing structure dsa_keygen_buffers
dc3e433 avoid redundant typecasts when accessing structure dsa_verify_buffers
d189aea avoid redundant typecasts when accessing structure dsa_sign_buffers
bc77727 clarify assignments in dsa_verify_init_crypto_mem
0a33653 clarify assignments in dsa_sign_init_crypto_mem
bc223b9 fix incorrect macro-expansion of arguments
c203b2e remove redundant subtraction in dsa.c round-robin code
e3f03bc remove dead code in ecdsa_test.c
7b236cb remove dead code in rsa_test.h
d084594 whitespace clean-up in rsa, dsa and ecdsa test vectors
b7e292a white-space clean-up in dsa.c
f792c40 add notifications about not supported configurations
309202d fix SEC jobs error reporting
f67f35c fix debug print for descriptors
973c09d sync with firmware build 8fcd0bc
3d32570 remove not necessary #includes in algs_reg.c
806bfae refactoring: merge trivial VIRTIO functions
4074a65 fix build error for VIRTIO_C2X0=y
58d8ba0 reduce #ifdef obfuscation for sym_cra_init and sym_cra_exit
ee3aa86 merge three adjacent #ifndef VIRTIO_C2X0 regions
07b8e40 move sym_cra_init and sym_cra_exit to allow merge of #ifdef regions
e545259 move fill_crypto_dev_sess_ctx function to merge two #ifdef regions
143d79f do not silence print_error at build time
4ed84e3 remove redundant void* to void* type casting
47b6f64 refactoring: use compound statements with if constructs
cd15d02 use dev_err to print device related errors
30a5705 replace ALIGN* macros by function calls
96d67e7 remove redundant #define for BRR_VALUE
2d74d96 remove unnecessary #include's from crypto_ctx.h
0ac80bd rename rsa test callback function for clarity
4ee3ee1 match types of members in fsl_crypto_alg with those in related structures
b6f6e97 rename structure to avoid confusions with the variables
c960102 always print errors related to descriptors
9920b1f update ring index at the end of the loop
67f743b remove redundant typedef fsl_h_mem_handshake_t
3039d45 remove redundant typedef crypto_h_mem_layout_t
4b19fb5 remove redundant typedef crypto_c_hs_mem_t
6ae863d remove redundant typedef fsl_pci_dev_t
e8050e2 remove redundant typedef driver_ob_mem_t
1ac31db remove redundant structure crypto_dev_mem_info
8b134fb rename members of pci_bar_info structure
60ffef6 remove redundant typedef pci_bar_info_t
1ce8047 use the same type for function and return variable
319bc02 make temporary variables the same type as the original
3fbe1f7 rename variable and function for clarity
4d4bf3c make volatile the handshake memory on host
d64eac6 fix reading values from the local memory
692ab74 rename variable to reduce reading confusions
c9ad613 rename per_core_struct as bh_handler
5c30ce6 remove duplicate bottom half handler variable
15254d0 merge content of structures bh_handler and per_core_struct
e54a71d sync with firmware build bef6960
d1e1e5e remove redundant macro RING_FULL from within block
64898d4 clarify comment about where to put fw_resp_ring
d819503 remove not used global variables
0fb1293 remove not used define
09b590d relocate external declaration of *per_core
91a450e remove Makefile target 'dist' incorrectly aliased to 'clean'
dda196a separate cli application build from the driver
7261910 build a dynamic linking cli application
df39d8c use a bigger type for req_mem_size
f78435f fix machine crash on timer test
a7e8a6a add firmware fixes for incorrect IRQ signalling
27751bf refactor: remove common_sysfs_show/store from sysfs.h
4a60e77 remove redundant print function
464704b sync with firmware updates
71446a0 clean-up tests before releasing driver structures
6d982cd fix offset calculation for shared counters struct
110b1e7 remove duplicate code and #ifdef branch
f3e08dd refactoring: extract function from loop to enhance clarity
745af67 remove redundant structure for shadow counters
1f92e9b remove not used external declaration
0a53ea3 remove code fragment without purpose
26d2ef5 remove redundant fw_resp_ring_t typedef
d65d0e7 remove redundant shadow_memory structure
5fb0526 remove redundant resp_ring_entry_t typedef
76f0d17 remove redundant ring_counters_mem_t typedef
a7f5054 remove redundant ring_shadow_counters_mem_t typedef
d2e1765 remove redundant ring_idxs_mem_t typedef
ad94e8a remove redundant counters_mem_t typedef
f9a4c40 remove not used typedef
c581cd1 use #else to merge two exclusive #ifdef's
18909d3 remove not used structure member
4c83440 add include guards for crypto_ctx.h
edeee8a remove redundant structure ctx
c93c234 fix Makefile to allow parallel make
e43b78e fix round-robin context allocation for RSA operations
f9beb49 remove unnecessary lock contention
31e004a add static qualifier for file-bound variables
bbba578 remove code for handling INTx and MSIx
7e04c32 remove unnecessary self-asignment
8f79b8c remove wt_cpu_mask variable definition from header file
d1a76fd cleanup: remove unnecessary "include"s
a6d3286 rename reserved identifiers
21cb055 rename source files to avoid confusions
8072597 use kernel API to count the cpus
bb2ddcd rename lock variable to match its purpose
e51e179 fix incorrect use of get_cpu() on debug_print
4a2d864 clear test_done flag inside check_test_done()
5432210 clarify function return value
7ef3b7a remove unused header inclusions
3119e2a move get_cpu_ticks definitions closer to their users
34bd796 remove unused 'flag' argument from callbacks
602db60 remove leftovers from Makefile
fff643f merge two related short functions
36e7aeb clarify debug print message
0908d09 rename function
a441393 rearrange code to remove forward declaration
9e303f3 clean-up formatting and remove dead code
509ce95 make sure side-effect ioreads are not optimized away
d2104ff read-back the last written LAW to guarantee LAWs visibility
f58b316 split boot procedure into independent functions
8543c2f decrement device count on device remove
d4e5650 fix CPU core reset sequence
90726f3 do only a CPU core reset when device is removed
ae4e740 execute device reset inside device remove function
ad65fdb remove rearrange_config function
b3d4633 remove redundant typedef resp_ring_entry_t
d025737 remove redundant rounding of ring lengths
5805ff8 remove unused priority queue code
bf6ee11 clarify the kernel patch procedure
2d19537 refactoring: use sg_cnt as index
c8ad184 clear ring lists before freeing ring memory
1969e0a consider all warnings as errors
d262686 clean-up Makefile
e445714 Revert "add parameters to help with cross-compilation"
0877954 use standard macros to identify the platform
ae1d33b move functions around to remove forward declarations
1318c36 remove unnecessary forward declarations
bc07560 fix pointer dereferencing after kfree
533ccd6 remove unreachable #ifdef 0 code
a03f89c remove strict_strtol macro
74f890d mark hanshake success inside handshake function
f9460fb remove unused macros
8313f5c refactoring: remove unnecessary code block
2c4f52c refactoring: extract function hs_init_rp_complete
2a2139a refactoring: extract function hs_fw_init_complete
563cf8c refactoring: extract function hs_firmware_up
5e26693 remove unnecessary Makefile variables
5de6d6d remove conditional code for non-powerpc platforms
528a89d remove no longer used code
5e65fa6 use portable definitions for big endian READ64/WRITE64
0a2b97d remove ASSIGN32 macro from the rest of files
2347c8d remove ASSIGN32 macro from rsa.c
e277959 remove ASSIGN32 macro from hash.c and symmetric.c
cde6406 remove ASSIGN32 macro from dsa.c
3f9613c remove ASSIGN32 macro from dh.c
e6d0ba2 remove all uses of ASSIGN16 macro
7ad9d6c remove all uses of ASSIGN8 macro
0a7f003 use portable constructs for all platforms
3cb5a4c remove more iowrite macros
6acb490 remove unnecessary wrapper over iowrite8
29cd4a0 remove remaining wrapper macros for PCI 32bit read/write
c3c895e use iowrite32b to write to PIC_PIR register
b8dd736 set a single workqueue for operations
367f105 remove unused members of per_core_struct_t
0e7324c remove unused tasklets related code
724dcd9 remove support for pre 2.6.19 kernels
ef22e13 refactoring: avoid redundant typecast to void *
ab04330 explain the choice of index for response ring
8bd4428 clarify the meaning of these assignments
6e0950a simplify calculation of handshake memory address
09d4f8e refactoring: use variable to avoid duplicated addition
886354a remove duplicated definitions of CACHE_LINE_SIZE
199efd0 fix calculation of outbound memory length
d8d918f clarify value of dev->tot_req_mem_size to avoid code review issues
0ab7a57 remove unnecessary "crypto_dev_config_t" type definition
1b029f8 move assignment out of the if condition
ba8fb48 remove unused initialization values
3fd6b86 remove unused "crypto_config_t" structure
fb7fc22 add note for enabling ECC
098edf9 explain what is going on during endpoint setup
a3cb153 fix value of TRGT field for PEX_PEXIWAR1
eb69306 refactoring: use kernel IO API to access device registers
476f25d minor clean-up in debug-prints
8555a14 remove unmaintained code
68cdc01 refactoring: remove short function
691e809 use upper case to refer to base address registers
19314aa remove one of two identical enum types
fc3e81a remove conditional padding of buffer_header struct
df81cc2 remove rarely used macros
151125f remove dead conditional code
f8b9a76 remove redundant #ifdef
c7b0ae0 merge conditional code blocks to ease their removal
47971d3 always link pkc.o when building the driver
df748c3 fix several compiler warnings with debug print enabled
128553a Merge pull request #11 in SDK/pkc-host from ~B47441/pkc-host:master to master
a2ae0f4 config device for proper module removal
185a2ef Merge pull request #10 in SDK/pkc-host from ~B18196/pkc-host:master to master
1dcb2cc add build option to disable hmac algorithms
341f4d3 Merge pull request #9 in SDK/pkc-host from ~B18196/pkc-host:hash_cleanup to master
255413f move hash init functions to hash.c
33be668 move virtio hash init functions to hash.c
d4f4aed make structure definition accessible from algs.h
a2bace7 remove compiler warnings about unused variables and labels
564feb6 remove debug-print compiler warnings
a6dd5d6 make the include tree more shallow
ed759f1 remove block of not-used macros
8daa0a6 replace unused debug-print switch
82001b1 remove dead/commented code
e58a21b Merge pull request #8 in SDK/pkc-host from ~B18196/pkc-host:bugfix_QSDK-2327 to master
367235b add firmware fixes for board in PKC mode
6bf2320 Merge pull request #5 in SDK/pkc-host from ~B18196/pkc-host:bugfix_hash_array_index to master
dc26e18 bound-check digest operation before array indexing
d596ccb clean-up exit logic in hash_cra_init
e4df9e0 remove dead code in algs_reg.h
9aa8c6f fix debug-print typo
7d9751b fix error-path clean-up for fsl_crypto_pci_probe
d52f083 refactoring: extract loop into fsl_request_irqs function
b467d27 refactoring: extract code-blocks into reusable functions
64dd967 cache the interrupt type for later
1ad35e9 fix isr_context memory deallocation
1130b94 save the actual requested irq number to free later
4526b47 use a single variable to remember the interrupt type
a972d1e refactoring: extract clean-up code into a function
48afa04 rename error code variable
4bb959e check for NULL pointers before dereferencing
ac2fc15 partial revert of c_buffers references to fix digest regression
6917577 fix incorrect buffer mem distribution
815942b dh.c: make variable declaration local to the code-block using it
6bd72b7 add comments requesting handshake clarifications
7be5358 refactoring: extract code block into send_hs_init_config() function
a7569d9 make num_of_rings uint8_t as in the rest of the code
c1adb61 fix 64bit compiler warning on printf type conversion
11a31e0 remove comments that duplicate code
296ac75 remove unnecessary NULL check for 'prev' pointer
9db737b remove cli binary from the package
c25fc89 merge prev and after pointers as they perform the same role
499e212 check for non-null pointer to continue rsa operation
897efd2 remove unnecessary initializations
186da4e sanitize function alloc_crypto_mem()
71dbe8b remove "retry alloc" feature
e9eba60 substitude macro with a local variable
15599db remove un-reachable code
0f20b53 fix memory deallocation on ecdsa_keygen_test
ddd3c5f snprintf to safer buffer boundaries
93d41be fix compiler warning: zero-length gnu_printf format string
d544973 minor clean-up of variable definitions in inner code-block
f4fa7f4 revert condition to decrease code indentation
44de183 return error if we see too many <ring> labels
16fc7ff use uint8_t to avoid explicit downcasts in assignments
7406811 comment unused code and leave it as a reminder
c6a3dca use uint8_t to hold values for 'struct buffer_header' flag field
360d092 rsa: return error if given an unsupported request type
dcfcc82 use u16 to hold values for offset in struct sec4_sg_entry
7689504 fix creation of circular list
7e9934b remove unreachable code
ad95665 return from callback if device config is not found
3c4fcd3 remove redundant initialization of 'loop'
86a3cca refactoring: extract common code in both branches of if statement
6b1e6cf init completion before enqueuing the operation
634b3f6 refactoring: use crypto_op_t to identify rng operations
6316fe8 fix test in if statement
ec1d529 initialize error code in case we have an incorrect no_secs value
1f766cb fix error checking in rng initialization logic
bc09c80 remove redundant initializations
885eee8 remove redundant temporary variable
83d01d3 use u16 type to hold msi/msix interrupt vector entries
533942f add explicit cast to avoid static code analysis issues
6083b6c check buffer boundaries in prepare_crypto_cfg_info_string()
d092710 sanitize parsing_test_command() function
9666743 fix clean-up path for fsl_crypto_layer_add_device
be74851 remove unnecessary variable
739b08e change function type from int32_t to void
d95aaa2 remove dummy code
6f32f94 check for buffer boundaries before copying
e495e63 use flag setters/getters to reduce code duplication
ad23ae5 add more utilities to get/set flag values
bcf3a1e refactoring: replace space indentation with tabs
be34550 use positive logic in #ifdef #else #endif blocks
7a36935 check for memory allocation errors on pool inits
d36c2dd move assignment inside the block where it is used

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

diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index f7a62ed..c07f85a 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -10,8 +10,8 @@ RDEPENDS_${PN} += "cryptodev-module bc"
 # if it is fixed.
 REQUIRED_DISTRO_FEATURES = "c29x_pkc"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1"
-SRCREV = "564f535d596f43eb2901a7ff77bbe529a118c16e"
+SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;branch=sdk-v1.9.x"
+SRCREV = "26df0a3641abd77a3fd43c29b71115f8cc31d514"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 35/60] pkc-host: do not install cli

[ting.liu]

From: Cristian Stoica <cristian.stoica@freescale.com>

cli is a user-space application, and is splitted from pkc-host

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/pkc-host/pkc-host_git.bb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index c07f85a..952d66a 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -18,13 +18,12 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
 do_install() {
-        oe_runmake INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}/etc/crypto
-        install -d ${D}/${bindir}
-        cp ${S}/crypto.cfg ${D}/etc/crypto
-        cp ${S}/images/pkc-firmware.bin ${D}/etc/crypto
-        cp ${S}/apps/cli/cli ${D}/${bindir}
-        cp ${S}/perf/c29x_driver_perf_profile.sh ${D}/${bindir}
+    oe_runmake INSTALL_MOD_PATH="${D}" modules_install
+    install -d ${D}/etc/crypto
+    install -d ${D}/${bindir}
+    cp ${S}/crypto.cfg ${D}/etc/crypto
+    cp ${S}/images/pkc-firmware.bin ${D}/etc/crypto
+    cp ${S}/perf/c29x_driver_perf_profile.sh ${D}/${bindir}
 }
 
 
-- 
1.9.2

[PATCH 36/60] pkc-host: set COMPATIBLE_MACHINE as qoriq-ppc

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

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

diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index 952d66a..3343f19 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -33,4 +33,4 @@ FILES_${PN} = "${bindir}/cli \
     /etc/crypto/pkc-firmware.bin \
 "
 
-COMPATIBLE_MACHINE = "(p4080ds)"
+COMPATIBLE_MACHINE = "(qoriq-ppc)"
-- 
1.9.2

[PATCH 37/60] qemu-qoriq: enable back libusb through PACKAGECONFIG

[ting.liu]

From: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>

This fixes usb passthrough support.

Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Cc: Lu Wei <wei.lu@freescale.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-devtools/qemu/qemu-qoriq_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 3c61317..167a9b8 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -24,13 +24,14 @@ S = "${WORKDIR}/git"
 
 QEMU_TARGETS_qoriq-ppc = "ppc"
 QEMU_TARGETS_qoriq-arm = "arm"
-PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb'
+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}"
 EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e5500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}"
+PACKAGECONFIG_append = " libusb"
 
 inherit pkgconfig
 
-- 
1.9.2

[PATCH 38/60] qemu-qoriq: update to commit 8362a29

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
8362a29 nbd: fix type conversion error when doing ioctl

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 167a9b8..7a959a3 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -17,8 +17,8 @@ PV = "2.2.0+${SRCPV}"
 # to qemu 2.3:
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
-SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.9.x"
+SRCREV = "8362a298c4feef33c84d7db2d111af18bd29ef86"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 39/60] qemu-qoriq: empty not supported PACKAGECKG

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 7a959a3..e799cf2 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -16,6 +16,12 @@ PV = "2.2.0+${SRCPV}"
 # restore it, but we should remove the following lines when upgrading
 # to qemu 2.3:
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
+# remove not supported PACKAGECONFIG by this v2.2.0 based recipe
+PACKAGECONFIG[gnutls] = ""
+PACKAGECONFIG[gcrypt] = ""
+PACKAGECONFIG[nettle] = ""
+PACKAGECONFIG[nss] = ""
+RDEPENDS_${PN}_append = " gnutls"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.9.x"
 SRCREV = "8362a298c4feef33c84d7db2d111af18bd29ef86"
-- 
1.9.2

[PATCH 40/60] qemu_qoriq: import ptest patches from poky

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 .../qemu/qemu-qoriq/add-ptest-in-makefile.patch    | 29 ++++++++++++++++++++++
 recipes-devtools/qemu/qemu-qoriq/run-ptest         |  8 ++++++
 recipes-devtools/qemu/qemu-qoriq_git.bb            |  8 ++++++
 3 files changed, 45 insertions(+)
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/run-ptest

diff --git a/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
new file mode 100644
index 0000000..a99f720
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+Add subpackage -ptest which runs all unit test cases for qemu.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ tests/Makefile |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 88f7105..3f40b4b 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -405,3 +405,12 @@ all: $(QEMU_IOTESTS_HELPERS-y)
+ 
+ -include $(wildcard tests/*.d)
+ -include $(wildcard tests/libqos/*.d)
++
++buildtest-TESTS: $(check-unit-y)
++
++runtest-TESTS:
++	for f in $(check-unit-y); do \
++		nf=$$(echo $$f | sed 's/tests\//\.\//g'); \
++		$$nf; \
++	done
++
+--
+1.7.9.5
+
diff --git a/recipes-devtools/qemu/qemu-qoriq/run-ptest b/recipes-devtools/qemu/qemu-qoriq/run-ptest
new file mode 100644
index 0000000..f4b8e97
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-qoriq/run-ptest
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+#This script is used to run qemu test suites
+ptestdir=$(pwd)
+cd tests
+
+export SRC_PATH=$ptestdir
+make -k runtest-TESTS | sed '/: OK/ s/^/PASS: /g'
diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index e799cf2..26f1596 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 require recipes-devtools/qemu/qemu.inc
 
 DESCRIPTION = "This recipe requires poky's qemu.inc which includes the FSL \
@@ -26,6 +28,12 @@ RDEPENDS_${PN}_append = " gnutls"
 SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.9.x"
 SRCREV = "8362a298c4feef33c84d7db2d111af18bd29ef86"
 
+# add ptest patches
+SRC_URI_append = "\
+    file://add-ptest-in-makefile.patch \
+    file://run-ptest \
+"
+
 S = "${WORKDIR}/git"
 
 QEMU_TARGETS_qoriq-ppc = "ppc"
-- 
1.9.2

[PATCH 41/60] qemu-qoriq: replace /usr/share with ${datadir}

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 26f1596..d6ff612 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -71,7 +71,7 @@ do_install_append() {
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
 }
 
-FILES_${PN} += "/usr/share/qemu/"
+FILES_${PN} += "${datadir}/qemu/"
 INSANE_SKIP_${PN} += "dev-deps"
 
 # FIXME: Avoid WARNING due missing patch for native/nativesdk
-- 
1.9.2

[PATCH 42/60] qemu-qoriq: porvide qemu

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Otherwise the version in Poky will be used as some pkgs depends on qemu.

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

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index d6ff612..d2e66c9 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -2,6 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 require recipes-devtools/qemu/qemu.inc
 
+PROVIDES += "qemu"
+
 DESCRIPTION = "This recipe requires poky's qemu.inc which includes the FSL \
 fixes of QorIQ ARM and QorIQ PPC targets, the recipe assumes that glx enable \
 config option is changed to --enable-opengl. The recipe only works for FSL \
-- 
1.9.2

[PATCH 43/60] cst: update to commit 65f79eb

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Update LIC_FILES_CHKSUM as the code layout changed.
New commits imported:
65f79eb Corrected Bit number printing for LayerScape SoC's
336e5f3 Added attribution to Brad Conte for SHA256 code
6d867f4 OTPMK and DRV utilities have been renamned
0cf0787 Hash_DRBG library license chanaged to BSD
4c941cd VERBOSITY option added in Makefile
8313f56 Makefile modified for distclean
becbb28 OTPMK Hamming algorithm used from library
f3c205f Library compiled as a static library
d17368c hash_drbg library integrated in CST
66ac7df CST directory structure modified
f84a78e Memory errors resolved
ea0ead0 gen_otpmk: Corrected bit Order Printing
74bbb24 LS1043: Input Files added
2f8225a LS1:: Modify input file addresses for LS1021 Rev2.0

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

diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb
index 08dbd56..62a9d05 100644
--- a/recipes-devtools/cst/cst_git.bb
+++ b/recipes-devtools/cst/cst_git.bb
@@ -3,14 +3,14 @@ SECTION = "cst"
 LICENSE = "BSD"
 
 # TODO: fix license - this file is not a license
-LIC_FILES_CHKSUM = "file://RELEASENOTES;beginline=8;endline=43;md5=5a7b22a2c96b5f94e0498c5f413aa8d3"
+LIC_FILES_CHKSUM = "file://include/common.h;beginline=8;endline=30;md5=573e4049ebb103e1cb3f63bc8aaf00b2"
 
 DEPENDS += "openssl"
 
 inherit kernel-arch
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=master"
-SRCREV = "6f57c86c93cab0f4d0a40d83b685afa6932a6301"
+SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=sdk-v1.9.x"
+SRCREV = "65f79eb1443211826a58ff225e86b251af5f0e12"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 44/60] fmc: update to commit a079d2c

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
a079d2c update variable names to match fmlib changes
44b1f42 Revert "Aging support added for classification"
9732cd8 Aging support added for classification
03505c3 [QSDK-2331] fmc: PIR/PBS are considered synonyms for CIR/CBS in policer tags
757754b ENGR00341753: Schemes sharing between ports is not working
eca7122 Added makefile support for LS1043

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

diff --git a/recipes-dpaa/fmc/fmc_git.bb b/recipes-dpaa/fmc/fmc_git.bb
index f9bd74f..d54b845 100644
--- a/recipes-dpaa/fmc/fmc_git.bb
+++ b/recipes-dpaa/fmc/fmc_git.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c"
 
 PR = "r2"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;nobranch=1"
-SRCREV = "b9e52be1f62a5fcc912d44875bf155ad55650d68"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;branch=sdk-v1.9.x"
+SRCREV = "a079d2c844edd85dff85a317a63198e7988bcd09"
 
 DEPENDS = "libxml2 fmlib tclap"
 
-- 
1.9.2

[PATCH 45/60] fmlib: update to commit d697de9

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
d697de9 fmlib: remove cc-aging support
9ec11a2 fmlib: fix coherency of data structures with fmd
d357b76 Merge pull request #8 in DPAAMODULES/fmlib from ~R27762/fmlib:add_hm_node_stats to master
7523dd1 fmlib: add support for FM_PCD_KgSchemeGetCounter
c1fd2c3 Render header manip node statistics available in user space
2a9113a fmlib: fix policer spelling issues
5e77666 fmlib: Remove FM_PORT_PcdPrsModifyStartOffset routine - not supported
4cdcebd fmlib: Update fmlib function name to its correct declaration name

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

diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 8993f84..7038f10 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -8,8 +8,8 @@ PR = "r1"
 DEPENDS += "virtual/kernel"
 DEPENDS_virtclass-native = ""
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fmlib.git;nobranch=1"
-SRCREV = "4938e099561d441c947d4ccdf2e601ab2966d8cc"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fmlib.git;branch=sdk-v1.9.x"
+SRCREV = "d697de9b0c867edcdb8851dc7320809cd7add67b"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 46/60] fm-ucode: update to commit 33c6c7a

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
33c6c7a fm-ucode: replace b4860_r2.0 file by b4860_r2.2
a039bc9 fm-ucode: release 106_x_17 version
b55c6e0 fm-ucode: release 106_x_16 version
6184be0 fm-ucode: add missing files for _108_ version
143ca18 fm-ucode: release 108_x_5 version

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index 52c79db..768a9c6 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -7,8 +7,8 @@ PR = "r1"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fm-ucode.git;nobranch=1"
-SRCREV = "2827f0054e125b634fb1701719ca31c7d068e335"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fm-ucode.git;branch=sdk-v1.9.x"
+SRCREV = "33c6c7a4ba1d057afd739bd0106471ffb3299e0e"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 47/60] eth-config: set CLEANBROKEN to 1

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

'make clean' not supported.

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, 2 insertions(+)

diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb
index 32ef1fa..9e69675 100644
--- a/recipes-dpaa/eth-config/eth-config_git.bb
+++ b/recipes-dpaa/eth-config/eth-config_git.bb
@@ -15,3 +15,5 @@ EXTRA_OEMAKE = "D=${D}"
 do_install() {
     oe_runmake install
 }
+
+CLEANBROKEN = "1"
-- 
1.9.2

[PATCH 48/60] usdpaa: update to commit b73546d

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
b73546d Merge pull request #59 in SDK/usdpaa from ~R54964/usdpaa:sdk-v1.8.x to sdk-v1.8.x
9f5bf07 qbman: add null check for lni while releasing sp
c414204 qbman: enable sending cscn to dcp for old qman revision
41d2593 qbman: hardcode the mps
6e644c7 qbman: Handle lock failure and memory leak
a8746fc dma_mem: Add check for lock failures
e45130e usdpaa: Relocate spin_lock_destroy calls
4e68d11 usdpaa: Update standalone-env and Makefile.kw

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

diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
index 7ac5e11..769224a 100644
--- a/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -9,8 +9,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "flib"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;nobranch=1"
-SRCREV = "3b0717952400577608a548fc4c4858a9efd1bd96"
+SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;branch=sdk-v1.9.x"
+SRCREV = "b73546dc923d9f3df92af08c2ebaf36d83ab96ea"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 49/60] usdpaa-apps: update to commit 1d9418a

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
1d9418a dpa_offload: Avoid creating multiple tables using the same Cc nodes
5a1f54e dpa_offload: Support multiple IPSec policies per tunnel

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb b/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
index 57b7546..1a19d1e 100644
--- a/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
+++ b/recipes-dpaa/usdpaa-apps/usdpaa-apps_git.bb
@@ -14,11 +14,11 @@ RDEPENDS_${PN} = "libgcc bash"
 RDEPENDS_${PN}_append_b4860qds = " ipc-ust"
 RDEPENDS_${PN}_append_b4420qds = " ipc-ust"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/usdpaa-apps;nobranch=1 \
+SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa/usdpaa-apps.git;branch=sdk-v1.9.x \
     file://fix-the-inline-function-definition-with-gcc-5.x.patch \
     file://xfrm_km.c-use-in6_-macros-from-glibc-instead-of-kern.patch \
 "
-SRCREV = "95744440cf214d73884c44c0dbc296e1e4b4c8f4"
+SRCREV = "1d9418af04990289bec72cd43a9385690523fcdb"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.2

[PATCH 50/60] kernel-module-asf: rename back to asf

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

asf ships not only .ko files, but also scripts.

As the recipe inherits module.bbclass, kernel-module-* will be
created to package .ko if installed into /lib/modules/.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 .../{kernel-modules/kernel-module-asf_git.bb => asf/asf_git.bb}           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-kernel/{kernel-modules/kernel-module-asf_git.bb => asf/asf_git.bb} (100%)

diff --git a/recipes-kernel/kernel-modules/kernel-module-asf_git.bb b/recipes-kernel/asf/asf_git.bb
similarity index 100%
rename from recipes-kernel/kernel-modules/kernel-module-asf_git.bb
rename to recipes-kernel/asf/asf_git.bb
-- 
1.9.2

[PATCH 51/60] asf: not package .ko files in PN

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

The .ko files will be packaged into kernel-modules-asf by default.

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

diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index a9624e4..7f355eb 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -31,6 +31,6 @@ do_install(){
     cp -rf ${S}/../scripts ${D}/${libexecdir}/
 }
 
-FILES_${PN} += "${libexecdir} /lib/modules/${KERNEL_VERSION}/asf"
+FILES_${PN} += "${libexecdir}"
 
 COMPATIBLE_MACHINE = "(qoriq)"
-- 
1.9.2

[PATCH 52/60] asf: remove empty install directories

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

If ASF was not enabled in kernel, no .ko will be generated.
rm these empty install directories to avoid QA issue.

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

diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index 7f355eb..8cfc018 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -29,6 +29,7 @@ do_install(){
     cp -rf ${S}/bin/full ${D}/lib/modules/${KERNEL_VERSION}/asf 
     cp -rf ${S}/bin/min  ${D}/lib/modules/${KERNEL_VERSION}/asf
     cp -rf ${S}/../scripts ${D}/${libexecdir}/
+    find ${D}/lib -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \;
 }
 
 FILES_${PN} += "${libexecdir}"
-- 
1.9.2

[PATCH 53/60] asf: update to commit 9580a62

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
9580a62 asf_ipsec: Patch to fix the compilation error.
e7a1828 Merge pull request #84 in SDK/asf from ~B49015/asf:sdk_1.9_master to sdk_1.9_master
eee4467 DEBUG: compilation error fixed when ASF_IPSEC_DEBUF flag is enabled.
71db029 asf_tcp: Patch to correct tcp timestamp type.
f8e3df0 IPSEC: Fixed for stack dump on running fragmented ping traffic
c63ffa5 asfipsec: Patch to fix iph issue in non-proto offload case.
7170610 asfipsec: Patch to decrement buffer count of all frag in red off case
f5cd876 asfipsec: Patch to fix inSA offload in NAT-T case.
d455e70 Makefile: use KBUILD_OUTPUT to point to build-artifacts
be19cd0 asf_frag: Patch to fix crash on mtu change.
0f88dae asf_ipv6_frag: Patch to fix ipv6 UDP frag and ping6 forwarding issue.
8c3f4bc ipsecfp.h: Patch to add support of SHA2-384 and SHA2-512
03bd11a ipsecfp.c: Patch to fix crash in ipsec in full mode.
e2213ef ipsec ctrl - correction in container index check
33e0fd4 ipsec - ah - fix the fragmentation case for dpbp check
f5f542d asf - return packets to linux on interface not found
1c7241e asfipsec - 64 bit support Signed-off-by: Hemant Agrawal <Hemant@freescale.com>
879b161 asfctrl - using ASF defined number of interfaces
83b6181 IPSEC: Crash fixed in case of revalidation
1b26690 ASF_REASM_DEBUG: Fix for compilation error when ASF_REASM_DEBUG is enabled
74a5953 ASF_DEBUG: Improving prints for ASF Debugging
eee54a3 asf icmp reply support for DF flag
10e3bf8 asfipsec - error checks, debug prints and error handling corrections
c47696c ipsec - lock, unlikely, null checks
5d26d9f ipsec- meaningfull caam error prints
834f88a asfipsec-ah- correction in ah shared desc direction
88edb32 asf_ipsec: adds the support for SHA2 algorithms in AH.
ca8c486 ASFIPSEC: While deleting container properly freeing the pSASPDMapNode in SA
c2c81cc ASF_IPSEC: Wrong counter being incremented. When OuSA is not found
32cea7f ASFIPSEC: Patch to avoid looping in case of rekeying on running traffic.
239c317 ASF_IPSEC: Adding local_bh_enable() in error case. CQ:ENGR00336981 Signed-off-by: Sridhar Pothuganti <sridhar.pothuganti@freescale.com> Change-Id: If72f7135fe5e294a51f0c582bdbd56ca3c78f844 Reviewed-on: http://git.am.freescale.net:8181/24207 Reviewed-by: Nikhil Agarwal <Nikhil.Agarwal@freescale.com> Reviewed-by: Sandeep Malik <Sandeep.Malik@freescale.com> Tested-by: Sandeep Malik <Sandeep.Malik@freescale.com>
42837b8 ASF_IPSEC_AH: ASFSkbFree is not happening for DPAA/QMAN based platforms in some error cases as the free is under check. Correcting this. CQ:ENGR00336981 Signed-off-by: Sridhar Pothuganti <sridhar.pothuganti@freescale.com> Change-Id: Iaf847710cf583ff4d7e708013af77f522027e2eb Reviewed-on: http://git.am.freescale.net:8181/24208 Reviewed-by: Arun Pathak <arun.pathak@freescale.com> Reviewed-by: Sandeep Malik <Sandeep.Malik@freescale.com> Tested-by: Sandeep Malik <Sandeep.Malik@freescale.com>
e0410f9 ASFIPSEC: [sswan] Fix for issues with Child SA re-negotiation.
e52f3c5 ASFIPSEC: Patch to fix flow re-validation issue.
b99fb26 ASF_IPSEC: Freeing the skb in case of ICV comparion failed for AH
163ed89 asf: Patch to fix ping6 fragmentation issue.
48220d7 asf: Patch to fix skb data pointer and other frag issue.
2ff46e7 ASF for DPAA integrated with Linux QoS module
a7d1981 asf-disabling qos compilation for dpaa platforms
8bcee43 ipsec-changing multi-policy sa support to be compile time
580a4f7 ipsecproc: Patch to fix display of ipsec stats.
955d26f asfctrl: Patch to fix error print when vlan i/f is removed.
44a5110 asf_fmc: Patch to update the name of xml files.
9f67f3f asf: Patch to fix ipv6 issue on dpaa.
fac492d asf: Patch to return jumbo packet back
6b3d862 Removing Ethernet padding in abuf to skb conversion
db49a6b Aligning function ASFFFPProcessAndSendFD and ASFFFPProcessAndSendPkt while validating flows
6b5e75d ASFIPSEC: Patch to fix issues of order conversion while code review.
1c80cd5 Klocwork_LS1021_ASF: Fixing klocwork issues.
6a4a834 ASF ARM Porting: Using ASF network order and host order macros.
e60d41c asfipsec: Patch to fix crash in running traffic when ipsec script is run.
b682589 Adding HARD_TX_LOCK while doing dev hard xmit.
da26fbd ASFIPSEC: Fix for out_sa stats not incremented in IPv6
3a41ff1 ASFQOS: Crash on configuring DRR QDisc after flushing out DRR Qdisc first time.
04fd26d ASFIPSEC: Patch to fix ICV error due to cache cohorency issue.
26b8f9d ASFIPSEC: Porting ASFIPSEC to LS1021
80d1153 ASFIPSEC: Flushing ah-sha1 policy at high rate
982d542 Firewall rules don't work if applied, before flows get offloaded.
a7a2fee ASF_FW/NAT: SCP is not working when SNAT [IPv4/IPv6] is enabled on the DUT.
9d2ed93 Applying Firewall rule in running traffic gives CRASH.
426aefa ASFIPSEC: Getting crash while testing for IPv6-in-IPv6 ESP with TCP protocol.
d3843de ASFIPSEC: Crash on making interface down.
ae72e06 ASF IPv6 Firewall: Sending high rate traffic in the
e19c45e ASF ARM Porting: While forwarding if we down Egress interface, we get crash.
c01729e ASF ARM Porting: Cannot remove configured VLan
0ac82ad ASFIPSEC: Porting IPSEC AH to LS1021A (arm based).
38671c3 ASF ARM porting: IPv6 Fragmentation
fb2ca85 ASF ARM porting: IPv4 Fragmentation
471a4b2 ASF ARM porting: IPv6 forwarding with TCP/UDP header.
4d443a1 ASF ARM Porting: Removing compilation error of ASF without rx tx patch in linux.
aa33f01 ASF ARM porting: IPv4 forwarding with UDP/TCP header.
f5a8705 ASF ARM porting: Defining order conversion macros.
3f76910 ASF ARM porting: Setting ARCH=$(ARCH) in Makefile
d5dabe7 ASF: Removing compilation error because of updation in linux structure 'dpa_priv_s'.
01cd004 asf: Patch to fix crash in case of ipsec at high rate traffic.
66fe758 asfipsec_ah: Patch to fix sha256 in case of AH only.
a81d920 asf: Patch to fix wrong port no assigned in ipsec flow.
8ebb93b asf: Patch to handle ipv6 traffic in case of seqno overflow.
fcd0843 asf: Patch to fix sha256 issue.
7467249 Crash observed with AH-ONLY-SHA384
9e37dc8 asf: Patch to fix some klockwork issue.
e1b2a12 ASFIPSEC: Adding support for handling IPv6 in IPv4 and IPv4 in IPv6 case in QMAN SEC4x
3c05ad1 ASFIPSEC: TOS is not correctly copied in IPv4 in IPv6 case
6363e0b Solution to Fragmented packets are not getting through AH tunnel
5a96807 asf: Patch to fix tail pointer-offset issue in 64-bit machine.
26375d3 ASFIPSEC: Solving problem in secfp_inCompleteCheckAndTrimPkt code
bdb17ab ASFIPSEC: Solving case of infinite loop in secfp_qman_out_submit
13dc5a9 ASFIPSEC: Freeing correct sgt pointer in espDQRRCallback
ca75bf9 ASFIPSEC: Incrementing pSG->len by ulFragPadlen in secfp_qman_in_submit
a58ba45 ASFIPSEC: struct addr in scatter_gather_entry_t is changed.
81d797b ASFIPSEC: Linearising frag_list or nr_frags coming from Linux
9458153 asf: Patch to remove conflict of skb cb field b/w reasm and ipsec.
4d3993b Solution to ESP IP pakcet more than interface MTU going out
1175536 ASFIPSEC: Handling seq number overflow in espDQRRCallback
b5fb8fc ASF: Removing compilation error after adding patch: "ASFFFP adding support for PPP-IPV6 traffic"
4018106 ASFFFP - adding support for PPP-IPV6 traffic
b26d25f asf_klockwork: Patch to fix issue reported by klockwork
36ffe84 ASFIPSEC: Fix for crash seen on T4240 in case of ping
ef4a7a1 asf_compilation: Patch to remove the compilation warnings.
3f7d40c secfp_finishOffloadOutPacket: corrected the SPD index value l2blob refresh
837a5f9 ASFIPSEC_AH: Fix for crash seen on T4240 in AH only case
745a912 ASFIPSEC: Fixing miscellaneous error
1cdde18 asfIpv4Fragment was not copying the IP options in fragmented packets.
62b1311 asfIpv4Defrag IP header length corruption solved
c7c8ba3 ASF fragmentation: Buffer freed in case of VLAN parent device  not found
2c478eb asf_free_buf_skb function was not considering the frag_lsit while releasing the buffer to BMan. asf_free_buf_skb is also called, in error case, after ip reassemmbly. In that case the buffers are leaked.
d0572b1 ASFIPSEC: Removing compilation errors.
ee1e3e8 ASF_IPSEC: Fix for SA leak(Orphaned SA wothout Container)
b2ac65f asf_ipsec: Patch to add the support for AH in Sec 3.x
44cb2b0 asf_reasm: Patch to fix the processing for re-asm.
99f89ed asf_ipsec: Patch for multi-policy single SA additional cases.
a6cb24c ASF-IPSEC:SA flush with traffic through the DUT causing crash.
fd7f119 ASFCTRL: Out SA is not getting offloaded if SA and then policy is configured.
93eb52b TC/TOS in inner header is not getting copied to TOS/TC of outer header respectively.
0fc4363 asf: Resolve fragmentation issue in case of red-off ipsec.
2ed8b33 ASF: Patch to fix hop-limit/ttl decrement in asf IPSec module.
d6cc5b5 ASFREASM: Patch to fix the crash in case cb not found.
aef3564 asf_ipsec_ah: Patch to fix the issue of ping6 not working.
5a82c4d ASFIPSEC: Use correct length in descriptor while using dpovrd for multiple policy.
f305c67 asf_ipsec: Patch to fix the ICV errors in case of ESN.
9b5ae90 asf_ipsec: Patch to fix the crash seen in case of AH IPsec.
ae85d24 ASFIPSEC: Trim correct fragment after decrypting packet.
8d2c11c ASFIPSEC_AH: Search AH table to find SA in case of dropping packet.
d83a4d5 ASFIPSEC: Changing the block size of AES-CTR.
a37f009 ASFIPSEC: Added des/3des-xcbc support.
38259f6 asf_ipsec: Patch for ICV errors seen in case of SHA256.
07e2c90 ASFIPSEC: Fix for ASF-IPSec to run with SA first then policy configuration.
62844a7 asf_ipsec: Patch to fix the issue of crash in Ping6.
4f60755 asf_ipsec: Patch to add the support of multiple policy mapping to single SA.
b5c14e6 ASF-AH: Take care of padding in ICV of AH Header
98c79ea asf_ipsec: Patch to fix the issue of errors introduced while removing the compilation errors.
31ab748 asf_ipsec: Patch to fix the issue of memory leak for ping6.
0e3836e asfipsec: TCP retransmission fails with IPSec configuration.
efdf28a ASF-IPv6-IPSEC : proper link table creation for IPv6 packets having nr_frags
69fccba ASFIPSEC: Correcting the in_sa and sa_list stats display
6552560 sf_ipsec: Patch to fix the issue of packet drop for > 1360 bytes.
55be89f ASFIPSEC: Added support for NULL XCBC algorithm.
a2a0982 asf_ipsec_qos: Patch to fix the memory leak in IPsec module.
103094e asf_ipsec: Patch to fix the AH IPv6 ping with ESN.
24cde96 ASFIPSEC: Fragment the IPv4 packet if required and send for IPv4-in-IPv6 tunnel.
2c16da6 ASF: setting gianfar_destructor to NULL before sending packet to linux.
9d817d0 asf_ipsec: Patch to add the support to copy DSCP from inner to outer header.
0992f05 IPSEC: fix for fragmentation data buffer corruption.
db18bda IPSEC- Supporting cipher algo AES-CTR, ESP-NULL and
81b20cd asfipsec-enabling seq overflow handling and adding re-keying in overflow case.
c23b1ae IPSEC-supporting PMTU based icmp in Source NAT case.
fd708ce asfipsec-fix the tail stripping for fragmented packets
1887c6d asfipsec-optimizing the mtu length check and l2blob expiry.
76c5d69 Fixed ESP padding in IPsec to be monotonically increasing numbers.
ca74bfa ASF: Removing compilation errors for XTRA Stats
606c594 Adding more functionality in asf_pktdump
80c8fa0 ASF: Supporting Multiple flows in SCTP
2ba1847 ASF: Miscellaneous changes
d27137e ASF: Supporting SCTP traffic in firewall/NAT
82a89e4 ASF: Invalidate all VSG's in asfctrl_invalidate_sessions function
ec6d625 ASF: Added VSG support
df42b23 ASF_V6: Patch to fix crash if first fragmented packet is sent to Linux
63a13e2 ASF: optimization of SG while fragmentation to reuse the first buffer
7718065 ASF: Check the more fragment bit for IPv6 at proper offset
810f173 ASF_FFP: Patch to fix the race condition in case of RT
c9e4edd ASF: dummy functions removal
e63f176 ASF: Making asfGetNode and asfReleaseNode thread safe
3e8e7b3 ASF: Fix for iface_not_found problem when device ifindex > 16
1354c95 ASF_REASMBLY: Modifying IP options only if option header is present
349d6d9 ASF: Change the dummy packet offset
b3ee577 ASF: made old_l2blob_jiffies_timeout user configurable
93c4864 ASF - runtime packet dump support
2471d1d ASF Cleanup - Timer RQ corrections
4180b6e Using IP header Identifcation field from the Head SKB itself.
a82969d ASF_IPv6: Porting the miscellenous changes for IPv6 activity.
61c08a4 ASF STATS - Adding extra stats for Reassembly and Timer
6def023 ASFSTATS - Enhancing the stats printing
3009524 Replacing printk with pr_err, pr_info, pr_warning
1f896bf ASF: Patch to avoid creation of duplicate flows
5862af3 ASF: Patch to add support for ip_options.
4c58c87 ASFIPSEC: Adding proc interface for showing IN/OUT SA list
4398bc9 ASF: Cleanup and reallignement of common global variables
1ebe80c ASFCTRL: Enabling the net MTU change event
7062cec ASF_REASSEM: Allocating fragmentation frame from outer dev
2875982 ASF: Minor enhancements
d41f350 ASF: Setting skb->next to null in asfReasmCleanCb
51d7efa ASF: Defining dimensioning macros at single place
93d673d ASF: updating the the asf reassembly library

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

diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index 8cfc018..b91b60e 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -3,8 +3,8 @@ SECTION = "asf"
 LICENSE = "GPLv2 & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=master"
-SRCREV = "62ba10ab6bab8f8f53934e4bb55b5a552bf3fd6b"
+SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v1.9.x"
+SRCREV = "9580a629d3aec3ab3c5e152c6693846b96787906"
 
 RDEPENDS_${PN} += "ipsec-tools"
 
-- 
1.9.2

[PATCH 54/60] asf: remove unnecessary ending spaces

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 recipes-kernel/asf/asf_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index b91b60e..34308e2 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -24,9 +24,9 @@ do_configure_prepend () {
 }
 
 do_install(){
-    install -d ${D}/${libexecdir} 
+    install -d ${D}/${libexecdir}
     install -d ${D}/lib/modules/${KERNEL_VERSION}/asf
-    cp -rf ${S}/bin/full ${D}/lib/modules/${KERNEL_VERSION}/asf 
+    cp -rf ${S}/bin/full ${D}/lib/modules/${KERNEL_VERSION}/asf
     cp -rf ${S}/bin/min  ${D}/lib/modules/${KERNEL_VERSION}/asf
     cp -rf ${S}/../scripts ${D}/${libexecdir}/
     find ${D}/lib -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \;
-- 
1.9.2

[PATCH 55/60] qoriq-debug: remove

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

This pkg will not be supported anymore.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
---
 .../kernel-modules/kernel-module-qoriq-debug_git.bb       | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 recipes-kernel/kernel-modules/kernel-module-qoriq-debug_git.bb

diff --git a/recipes-kernel/kernel-modules/kernel-module-qoriq-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-qoriq-debug_git.bb
deleted file mode 100644
index c08f057..0000000
--- a/recipes-kernel/kernel-modules/kernel-module-qoriq-debug_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "QorIQ Debug File System Module"
-SECTION = "qoriq-debug"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
-
-inherit module autotools-brokensep qoriq_build_64bit_kernel
-
-SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1"
-SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
-EXTRA_OEMAKE += 'SYSROOT="${D}"'
-
-- 
1.9.2

[PATCH 56/60] cryptodev: update to commit 53e4d0fe

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
53e4d0f fix COMPAT_CIOCKEY ioctl command number
7d0d0de remove MAY_BACKLOG flag from requests
85146b8 fix double free pkc->req on error
4078382 check return codes for copy to/from user functions

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc   |   4 +
 ...urn-codes-for-copy-to-from-user-functions.patch | 398 +++++++++++++++++++++
 .../0022-fix-double-free-pkc-req-on-error.patch    |  26 ++
 ...023-remove-MAY_BACKLOG-flag-from-requests.patch |  69 ++++
 ...4-fix-COMPAT_CIOCKEY-ioctl-command-number.patch |  29 ++
 5 files changed, 526 insertions(+)
 create mode 100644 recipes-kernel/cryptodev/files/0021-check-return-codes-for-copy-to-from-user-functions.patch
 create mode 100644 recipes-kernel/cryptodev/files/0022-fix-double-free-pkc-req-on-error.patch
 create mode 100644 recipes-kernel/cryptodev/files/0023-remove-MAY_BACKLOG-flag-from-requests.patch
 create mode 100644 recipes-kernel/cryptodev/files/0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
index ffd07a8..aa0e994 100644
--- a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
+++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
@@ -47,6 +47,10 @@ file://0017-remove-dead-code.patch \
 file://0018-fix-compat-warnings.patch \
 file://0019-fix-size_t-print-format.patch \
 file://0020-fix-uninitialized-variable-compiler-warning.patch \
+file://0021-check-return-codes-for-copy-to-from-user-functions.patch \
+file://0022-fix-double-free-pkc-req-on-error.patch \
+file://0023-remove-MAY_BACKLOG-flag-from-requests.patch \
+file://0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch \
 "
 
 # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc
diff --git a/recipes-kernel/cryptodev/files/0021-check-return-codes-for-copy-to-from-user-functions.patch b/recipes-kernel/cryptodev/files/0021-check-return-codes-for-copy-to-from-user-functions.patch
new file mode 100644
index 0000000..558d045
--- /dev/null
+++ b/recipes-kernel/cryptodev/files/0021-check-return-codes-for-copy-to-from-user-functions.patch
@@ -0,0 +1,398 @@
+From 4078382cfc69c0f5e582d485fe8cc778f9e458d1 Mon Sep 17 00:00:00 2001
+From: Cristian Stoica <cristian.stoica@freescale.com>
+Date: Mon, 21 Sep 2015 16:39:52 +0300
+Subject: [PATCH 21/23] check return codes for copy to/from user functions
+
+- these functions may fail and we should check their return codes.
+- fix an unintended fall-through in CRK_DSA_GENERATE_KEY
+- fix incorrect return code for CIOCASYMFETCHCOOKIE
+
+Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
+---
+ ioctl.c |  42 +++++++--------
+ main.c  | 183 ++++++++++++++++++++++++++++++----------------------------------
+ 2 files changed, 108 insertions(+), 117 deletions(-)
+
+diff --git a/ioctl.c b/ioctl.c
+index 7cd3c56..8fa3e5c 100644
+--- a/ioctl.c
++++ b/ioctl.c
+@@ -711,13 +711,13 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
+ 	case CRK_MOD_EXP:
+ 	{
+ 		struct rsa_pub_req_s *rsa_req = &pkc->req->req_u.rsa_pub_req;
+-		copy_to_user(ckop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
++		ret = copy_to_user(ckop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
+ 	}
+ 	break;
+ 	case CRK_MOD_EXP_CRT:
+ 	{
+ 		struct rsa_priv_frm3_req_s *rsa_req = &pkc->req->req_u.rsa_priv_f3;
+-		copy_to_user(ckop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
++		ret = copy_to_user(ckop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
+ 	}
+ 	break;
+ 	case CRK_DSA_SIGN:
+@@ -725,11 +725,11 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
+ 		struct dsa_sign_req_s *dsa_req = &pkc->req->req_u.dsa_sign;
+ 
+ 		if (pkc->req->type == ECDSA_SIGN) {
+-			copy_to_user(ckop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len);
+-			copy_to_user(ckop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
++			ret = copy_to_user(ckop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len) ||
++			      copy_to_user(ckop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
+ 		} else {
+-			copy_to_user(ckop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len);
+-			copy_to_user(ckop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
++			ret = copy_to_user(ckop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len) ||
++			      copy_to_user(ckop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
+ 		}
+ 	}
+ 	break;
+@@ -739,9 +739,9 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
+ 	{
+ 		struct dh_key_req_s *dh_req = &pkc->req->req_u.dh_req;
+ 		if (pkc->req->type == ECDH_COMPUTE_KEY)
+-			copy_to_user(ckop->crk_param[4].crp_p, dh_req->z, dh_req->z_len);
++			ret = copy_to_user(ckop->crk_param[4].crp_p, dh_req->z, dh_req->z_len);
+ 		else
+-			copy_to_user(ckop->crk_param[3].crp_p, dh_req->z, dh_req->z_len);
++			ret = copy_to_user(ckop->crk_param[3].crp_p, dh_req->z, dh_req->z_len);
+ 	}
+ 	break;
+ 	case CRK_DSA_GENERATE_KEY:
+@@ -750,16 +750,17 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
+ 		struct keygen_req_s *key_req = &pkc->req->req_u.keygen;
+ 
+ 		if (pkc->req->type == ECC_KEYGEN) {
+-			copy_to_user(ckop->crk_param[4].crp_p, key_req->pub_key,
+-					key_req->pub_key_len);
+-			copy_to_user(ckop->crk_param[5].crp_p, key_req->priv_key,
++			ret = copy_to_user(ckop->crk_param[4].crp_p, key_req->pub_key,
++					key_req->pub_key_len) ||
++			      copy_to_user(ckop->crk_param[5].crp_p, key_req->priv_key,
+ 					key_req->priv_key_len);
+ 		} else {
+-			copy_to_user(ckop->crk_param[3].crp_p, key_req->pub_key,
+-					key_req->pub_key_len);
+-			copy_to_user(ckop->crk_param[4].crp_p, key_req->priv_key,
++			ret = copy_to_user(ckop->crk_param[3].crp_p, key_req->pub_key,
++					key_req->pub_key_len) ||
++			      copy_to_user(ckop->crk_param[4].crp_p, key_req->priv_key,
+ 					key_req->priv_key_len);
+ 		}
++	break;
+ 	}
+ 	default:
+ 		ret = -EINVAL;
+@@ -1115,14 +1116,12 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
+ 
+ 		/* Reflect the updated request to user-space */
+ 		if (cookie_list.cookie_available) {
+-			copy_to_user(arg, &cookie_list, sizeof(struct pkc_cookie_list_s));
++			ret = copy_to_user(arg, &cookie_list, sizeof(struct pkc_cookie_list_s));
+ 		} else {
+ 			struct pkc_cookie_list_s *user_ck_list = (void *)arg;
+-			put_user(0, &(user_ck_list->cookie_available));
++			ret = put_user(0, &(user_ck_list->cookie_available));
+ 		}
+-		ret = cookie_list.cookie_available;
+ 	}
+-
+ 	return ret;
+ 	default:
+ 		return -EINVAL;
+@@ -1417,9 +1416,10 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_)
+ 		}
+ 
+ 		/* Reflect the updated request to user-space */
+-		if (cookie_list.cookie_available)
+-			copy_to_user(arg, &cookie_list,
+-				     sizeof(struct compat_pkc_cookie_list_s));
++		if (cookie_list.cookie_available) {
++			ret = copy_to_user(arg, &cookie_list,
++					sizeof(struct compat_pkc_cookie_list_s));
++		}
+ 	}
+ 	return ret;
+ 	default:
+diff --git a/main.c b/main.c
+index ed1c69a..e5adb93 100644
+--- a/main.c
++++ b/main.c
+@@ -223,31 +223,29 @@ int crypto_kop_dsasign(struct cryptodev_pkc *pkc)
+ 	dsa_req->m = dsa_req->priv_key + dsa_req->priv_key_len;
+ 	dsa_req->c = dsa_req->m + dsa_req->m_len;
+ 	dsa_req->d = dsa_req->c + dsa_req->d_len;
+-	copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len);
+-	copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len);
+-	copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len);
+-	copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len);
+-	copy_from_user(dsa_req->priv_key, cop->crk_param[4].crp_p,
+-		       dsa_req->priv_key_len);
++	rc = copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len) ||
++	     copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len) ||
++	     copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len) ||
++	     copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len) ||
++	     copy_from_user(dsa_req->priv_key, cop->crk_param[4].crp_p, dsa_req->priv_key_len);
+ 	if (cop->crk_iparams == 6) {
+ 		dsa_req->ab = dsa_req->d + dsa_req->d_len;
+-		copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
++		rc = rc || copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
+ 			       dsa_req->ab_len);
+ 	}
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+ 		if (cop->crk_iparams == 6) {
+-			copy_to_user(cop->crk_param[6].crp_p, dsa_req->c,
+-				     dsa_req->d_len);
+-			copy_to_user(cop->crk_param[7].crp_p, dsa_req->d,
+-				     dsa_req->d_len);
++			rc = rc ||
++			     copy_to_user(cop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len) ||
++			     copy_to_user(cop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
+ 		} else {
+-			copy_to_user(cop->crk_param[5].crp_p, dsa_req->c,
+-				     dsa_req->d_len);
+-			copy_to_user(cop->crk_param[6].crp_p, dsa_req->d,
+-				     dsa_req->d_len);
++			rc = rc ||
++			     copy_to_user(cop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len) ||
++			     copy_to_user(cop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
+ 		}
+ 	} else {
+ 		if (rc != -EINPROGRESS && rc != 0)
+@@ -303,31 +301,28 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
+ 	dsa_req->m = dsa_req->pub_key + dsa_req->pub_key_len;
+ 	dsa_req->c = dsa_req->m + dsa_req->m_len;
+ 	dsa_req->d = dsa_req->c + dsa_req->d_len;
+-	copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len);
+-	copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len);
+-	copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len);
+-	copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len);
+-	copy_from_user(dsa_req->pub_key, cop->crk_param[4].crp_p,
+-		       dsa_req->pub_key_len);
++	rc = copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len) ||
++	     copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len) ||
++	     copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len) ||
++	     copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len) ||
++	     copy_from_user(dsa_req->pub_key, cop->crk_param[4].crp_p, dsa_req->pub_key_len);
+ 	if (cop->crk_iparams == 8) {
+ 		dsa_req->ab = dsa_req->d + dsa_req->d_len;
+-		copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
+-			       dsa_req->ab_len);
+-		copy_from_user(dsa_req->c, cop->crk_param[6].crp_p,
+-			       dsa_req->d_len);
+-		copy_from_user(dsa_req->d, cop->crk_param[7].crp_p,
+-			       dsa_req->d_len);
++		rc = rc ||
++		     copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p, dsa_req->ab_len) ||
++		     copy_from_user(dsa_req->c, cop->crk_param[6].crp_p, dsa_req->d_len) ||
++		     copy_from_user(dsa_req->d, cop->crk_param[7].crp_p, dsa_req->d_len);
+ 	} else {
+-		copy_from_user(dsa_req->c, cop->crk_param[5].crp_p,
+-			       dsa_req->d_len);
+-		copy_from_user(dsa_req->d, cop->crk_param[6].crp_p,
+-			       dsa_req->d_len);
++		rc = rc ||
++		     copy_from_user(dsa_req->c, cop->crk_param[5].crp_p, dsa_req->d_len) ||
++		     copy_from_user(dsa_req->d, cop->crk_param[6].crp_p, dsa_req->d_len);
+ 	}
++
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+-	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+-	} else {
++	if (pkc->type != SYNCHRONOUS) {
+ 		if (rc != -EINPROGRESS && !rc)
+ 			goto err;
+ 		pkc->cookie = buf;
+@@ -380,24 +375,15 @@ int crypto_kop_rsa_keygen(struct cryptodev_pkc *pkc)
+ 	rc = cryptodev_pkc_offload(pkc);
+ 
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+-
+-		copy_to_user(cop->crk_param[0].crp_p,
+-				key_req->p, key_req->p_len);
+-		copy_to_user(cop->crk_param[1].crp_p,
+-				key_req->q, key_req->q_len);
+-		copy_to_user(cop->crk_param[2].crp_p,
+-				key_req->n, key_req->n_len);
+-		copy_to_user(cop->crk_param[3].crp_p,
+-				key_req->d, key_req->d_len);
+-		copy_to_user(cop->crk_param[4].crp_p,
+-				key_req->dp, key_req->dp_len);
+-		copy_to_user(cop->crk_param[5].crp_p,
+-				key_req->dq, key_req->dq_len);
+-		copy_to_user(cop->crk_param[6].crp_p,
+-				key_req->c, key_req->c_len);
+-		} else {
++		rc = rc ||
++		     copy_to_user(cop->crk_param[0].crp_p, key_req->p, key_req->p_len) ||
++		     copy_to_user(cop->crk_param[1].crp_p, key_req->q, key_req->q_len) ||
++		     copy_to_user(cop->crk_param[2].crp_p, key_req->n, key_req->n_len) ||
++		     copy_to_user(cop->crk_param[3].crp_p, key_req->d, key_req->d_len) ||
++		     copy_to_user(cop->crk_param[4].crp_p, key_req->dp, key_req->dp_len) ||
++		     copy_to_user(cop->crk_param[5].crp_p, key_req->dq, key_req->dq_len) ||
++		     copy_to_user(cop->crk_param[6].crp_p, key_req->c, key_req->c_len);
++	} else {
+ 		if (rc != -EINPROGRESS && !rc) {
+ 			printk("%s: Failed\n", __func__);
+ 			goto err;
+@@ -451,30 +437,33 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
+ 	key_req->g = key_req->r + key_req->r_len;
+ 	key_req->pub_key = key_req->g + key_req->g_len;
+ 	key_req->priv_key = key_req->pub_key + key_req->pub_key_len;
+-	copy_from_user(key_req->q, cop->crk_param[0].crp_p, key_req->q_len);
+-	copy_from_user(key_req->r, cop->crk_param[1].crp_p, key_req->r_len);
+-	copy_from_user(key_req->g, cop->crk_param[2].crp_p, key_req->g_len);
++	rc = copy_from_user(key_req->q, cop->crk_param[0].crp_p, key_req->q_len) ||
++	     copy_from_user(key_req->r, cop->crk_param[1].crp_p, key_req->r_len) ||
++	     copy_from_user(key_req->g, cop->crk_param[2].crp_p, key_req->g_len);
++
+ 	if (cop->crk_iparams == 4) {
+ 		key_req->ab = key_req->priv_key + key_req->priv_key_len;
+-		copy_from_user(key_req->ab, cop->crk_param[3].crp_p,
++		rc = rc || copy_from_user(key_req->ab, cop->crk_param[3].crp_p,
+ 			       key_req->ab_len);
+ 	}
+ 
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+-
+ 		if (cop->crk_iparams == 4) {
+-			copy_to_user(cop->crk_param[4].crp_p, key_req->pub_key,
+-				     key_req->pub_key_len);
+-			copy_to_user(cop->crk_param[5].crp_p, key_req->priv_key,
++			rc = rc ||
++			     copy_to_user(cop->crk_param[4].crp_p, key_req->pub_key,
++				     key_req->pub_key_len) ||
++			     copy_to_user(cop->crk_param[5].crp_p, key_req->priv_key,
+ 				     key_req->priv_key_len);
+ 		} else {
+-			copy_to_user(cop->crk_param[3].crp_p, key_req->pub_key,
+-				     key_req->pub_key_len);
+-			copy_to_user(cop->crk_param[4].crp_p,
+-				     key_req->priv_key, key_req->priv_key_len);
++			rc = rc ||
++			     copy_to_user(cop->crk_param[3].crp_p, key_req->pub_key,
++				     key_req->pub_key_len) ||
++			     copy_to_user(cop->crk_param[4].crp_p, key_req->priv_key,
++				     key_req->priv_key_len);
+ 		}
+ 	} else {
+ 		if (rc != -EINPROGRESS && !rc)
+@@ -495,7 +484,7 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
+ 	struct dh_key_req_s *dh_req;
+ 	int buf_size;
+ 	uint8_t *buf;
+-	int rc = -EINVAL;
++	int rc = 0;
+ 
+ 	dh_req = &pkc->req->req_u.dh_req;
+ 	dh_req->s_len = (cop->crk_param[0].crp_nbits + 7)/8;
+@@ -520,22 +509,23 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
+ 	if (cop->crk_iparams == 4) {
+ 		dh_req->ab = dh_req->z + dh_req->z_len;
+ 		pkc->req->curve_type = cop->curve_type;
+-		copy_from_user(dh_req->ab, cop->crk_param[3].crp_p,
+-			       dh_req->ab_len);
++		rc = copy_from_user(dh_req->ab, cop->crk_param[3].crp_p, dh_req->ab_len);
+ 	}
+-	copy_from_user(dh_req->s, cop->crk_param[0].crp_p, dh_req->s_len);
+-	copy_from_user(dh_req->pub_key, cop->crk_param[1].crp_p,
+-		       dh_req->pub_key_len);
+-	copy_from_user(dh_req->q, cop->crk_param[2].crp_p, dh_req->q_len);
++
++	rc = rc ||
++	     copy_from_user(dh_req->s, cop->crk_param[0].crp_p, dh_req->s_len) ||
++	     copy_from_user(dh_req->pub_key, cop->crk_param[1].crp_p, dh_req->pub_key_len) ||
++	     copy_from_user(dh_req->q, cop->crk_param[2].crp_p, dh_req->q_len);
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+ 		if (cop->crk_iparams == 4)
+-			copy_to_user(cop->crk_param[4].crp_p, dh_req->z,
++			rc = rc || copy_to_user(cop->crk_param[4].crp_p, dh_req->z,
+ 				     dh_req->z_len);
+ 		else
+-			copy_to_user(cop->crk_param[3].crp_p, dh_req->z,
++			rc = rc || copy_to_user(cop->crk_param[3].crp_p, dh_req->z,
+ 				     dh_req->z_len);
+ 	} else {
+ 		if (rc != -EINPROGRESS && rc != 0)
+@@ -582,19 +572,19 @@ int crypto_modexp_crt(struct cryptodev_pkc *pkc)
+ 	rsa_req->dq = rsa_req->dp + rsa_req->dp_len;
+ 	rsa_req->c = rsa_req->dq + rsa_req->dq_len;
+ 	rsa_req->f = rsa_req->c + rsa_req->c_len;
+-	copy_from_user(rsa_req->p, cop->crk_param[0].crp_p, rsa_req->p_len);
+-	copy_from_user(rsa_req->q, cop->crk_param[1].crp_p, rsa_req->q_len);
+-	copy_from_user(rsa_req->g, cop->crk_param[2].crp_p, rsa_req->g_len);
+-	copy_from_user(rsa_req->dp, cop->crk_param[3].crp_p, rsa_req->dp_len);
+-	copy_from_user(rsa_req->dq, cop->crk_param[4].crp_p, rsa_req->dq_len);
+-	copy_from_user(rsa_req->c, cop->crk_param[5].crp_p, rsa_req->c_len);
++	rc = copy_from_user(rsa_req->p, cop->crk_param[0].crp_p, rsa_req->p_len) ||
++	     copy_from_user(rsa_req->q, cop->crk_param[1].crp_p, rsa_req->q_len) ||
++	     copy_from_user(rsa_req->g, cop->crk_param[2].crp_p, rsa_req->g_len) ||
++	     copy_from_user(rsa_req->dp, cop->crk_param[3].crp_p, rsa_req->dp_len) ||
++	     copy_from_user(rsa_req->dq, cop->crk_param[4].crp_p, rsa_req->dq_len) ||
++	     copy_from_user(rsa_req->c, cop->crk_param[5].crp_p, rsa_req->c_len);
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+ 
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+-		copy_to_user(cop->crk_param[6].crp_p, rsa_req->f,
+-			     rsa_req->f_len);
++		rc = rc || copy_to_user(cop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
+ 	} else {
+ 		if (rc != -EINPROGRESS && rc != 0)
+ 			goto err;
+@@ -633,14 +623,15 @@ int crypto_bn_modexp(struct cryptodev_pkc *pkc)
+ 	rsa_req->f = rsa_req->e + rsa_req->e_len;
+ 	rsa_req->g = rsa_req->f + rsa_req->f_len;
+ 	rsa_req->n = rsa_req->g + rsa_req->g_len;
+-	copy_from_user(rsa_req->f, cop->crk_param[0].crp_p, rsa_req->f_len);
+-	copy_from_user(rsa_req->e, cop->crk_param[1].crp_p, rsa_req->e_len);
+-	copy_from_user(rsa_req->n, cop->crk_param[2].crp_p, rsa_req->n_len);
++	rc = copy_from_user(rsa_req->f, cop->crk_param[0].crp_p, rsa_req->f_len) ||
++	     copy_from_user(rsa_req->e, cop->crk_param[1].crp_p, rsa_req->e_len) ||
++	     copy_from_user(rsa_req->n, cop->crk_param[2].crp_p, rsa_req->n_len);
++	if (rc)
++		goto err;
++
+ 	rc = cryptodev_pkc_offload(pkc);
+ 	if (pkc->type == SYNCHRONOUS) {
+-		if (rc)
+-			goto err;
+-		copy_to_user(cop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
++		rc = rc || copy_to_user(cop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
+ 	} else {
+ 		if (rc != -EINPROGRESS && rc != 0)
+ 			goto err;
+-- 
+2.3.5
+
diff --git a/recipes-kernel/cryptodev/files/0022-fix-double-free-pkc-req-on-error.patch b/recipes-kernel/cryptodev/files/0022-fix-double-free-pkc-req-on-error.patch
new file mode 100644
index 0000000..6e747e0
--- /dev/null
+++ b/recipes-kernel/cryptodev/files/0022-fix-double-free-pkc-req-on-error.patch
@@ -0,0 +1,26 @@
+From 85146b8429ba11bd0be68c24c17dd77b21ec8c25 Mon Sep 17 00:00:00 2001
+From: Cristian Stoica <cristian.stoica@freescale.com>
+Date: Mon, 12 Oct 2015 23:03:28 +0300
+Subject: [PATCH 22/23] fix double free pkc->req on error
+
+Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
+---
+ main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index e5adb93..ec11129 100644
+--- a/main.c
++++ b/main.c
+@@ -747,7 +747,7 @@ int crypto_run_asym(struct cryptodev_pkc *pkc)
+ 	/* todo - fix alloc-free on error path */
+ 	pkc->req->type = pkc_req_type;
+ 	err = call_next_action(pkc);
+-	if (pkc->type == SYNCHRONOUS)
++	if (err == 0 && pkc->type == SYNCHRONOUS)
+ 		kfree(pkc->req);
+ 
+ 	return err;
+-- 
+2.3.5
+
diff --git a/recipes-kernel/cryptodev/files/0023-remove-MAY_BACKLOG-flag-from-requests.patch b/recipes-kernel/cryptodev/files/0023-remove-MAY_BACKLOG-flag-from-requests.patch
new file mode 100644
index 0000000..32c3ddd
--- /dev/null
+++ b/recipes-kernel/cryptodev/files/0023-remove-MAY_BACKLOG-flag-from-requests.patch
@@ -0,0 +1,69 @@
+From 7d0d0deb255f8c59b0cf6d3944ee2e3be4133b4c Mon Sep 17 00:00:00 2001
+From: Alex Porosanu <alexandru.porosanu@freescale.com>
+Date: Mon, 19 Oct 2015 11:53:11 +0300
+Subject: [PATCH 23/23] remove MAY_BACKLOG flag from requests
+
+cryptodev doesn't implement the backlogging mechanism properly,
+since it misses the possibility of sleeping and waiting for
+wake-up when the crypto driver below starts working on the
+submitted backloggable request.
+In case the crypto driver below implements backlogging mechanisms,
+this can lead to side-effects such as working on previously-free'ed
+data.
+This patch removes the MAY_BACKLOG flag from the requests.
+
+Change-Id: Ia3d822b1abfc1a51e2ce3e9682476b2c99d19c5a
+Signed-off-by: Alex Porosanu <alexandru.porosanu@freescale.com>
+---
+ cryptlib.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/cryptlib.c b/cryptlib.c
+index 10f5e1a..eba4616 100644
+--- a/cryptlib.c
++++ b/cryptlib.c
+@@ -194,8 +194,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
+ 			goto error;
+ 		}
+ 
+-		ablkcipher_request_set_callback(out->async.request,
+-					CRYPTO_TFM_REQ_MAY_BACKLOG,
++		ablkcipher_request_set_callback(out->async.request, 0,
+ 					cryptodev_complete, out->async.result);
+ 	} else {
+ 		out->async.arequest = aead_request_alloc(out->async.as, GFP_KERNEL);
+@@ -205,8 +204,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
+ 			goto error;
+ 		}
+ 
+-		aead_request_set_callback(out->async.arequest,
+-					CRYPTO_TFM_REQ_MAY_BACKLOG,
++		aead_request_set_callback(out->async.arequest, 0,
+ 					cryptodev_complete, out->async.result);
+ 	}
+ 
+@@ -362,9 +360,8 @@ int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name,
+ 		goto error;
+ 	}
+ 
+-	ahash_request_set_callback(hdata->async.request,
+-			CRYPTO_TFM_REQ_MAY_BACKLOG,
+-			cryptodev_complete, hdata->async.result);
++	ahash_request_set_callback(hdata->async.request, 0,
++				   cryptodev_complete, hdata->async.result);
+ 
+ 	ret = crypto_ahash_init(hdata->async.request);
+ 	if (unlikely(ret)) {
+@@ -439,8 +436,7 @@ int cryptodev_pkc_offload(struct cryptodev_pkc *pkc)
+ 	int ret;
+ 
+ 	init_completion(&pkc->result.completion);
+-	pkc_request_set_callback(pkc->req, CRYPTO_TFM_REQ_MAY_BACKLOG,
+-				 cryptodev_complete_asym, pkc);
++	pkc_request_set_callback(pkc->req, 0, cryptodev_complete_asym, pkc);
+ 	ret = crypto_pkc_op(pkc->req);
+ 	if (ret != -EINPROGRESS && ret != 0)
+ 		goto error;
+-- 
+2.3.5
+
diff --git a/recipes-kernel/cryptodev/files/0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch b/recipes-kernel/cryptodev/files/0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch
new file mode 100644
index 0000000..8d0bd8b
--- /dev/null
+++ b/recipes-kernel/cryptodev/files/0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch
@@ -0,0 +1,29 @@
+From 53e4d0fe4a334dae3df32b2053e4ebdfda2e9148 Mon Sep 17 00:00:00 2001
+From: Tudor Ambarus <tudor.ambarus@freescale.com>
+Date: Tue, 27 Oct 2015 15:51:02 +0200
+Subject: [PATCH] fix COMPAT_CIOCKEY ioctl command number
+
+CIOCKEY and COMPAT_CIOCKEY had different command numbers,
+so that 32-bit applications got EINVAL error on 64-bit kernel.
+
+Signed-off-by: Tudor Ambarus <tudor.ambarus@freescale.com>
+---
+ cryptodev_int.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cryptodev_int.h b/cryptodev_int.h
+index c83c885..cb005d7 100644
+--- a/cryptodev_int.h
++++ b/cryptodev_int.h
+@@ -132,7 +132,7 @@ struct compat_crypt_auth_op {
+ /* compat ioctls, defined for the above structs */
+ #define COMPAT_CIOCGSESSION    _IOWR('c', 102, struct compat_session_op)
+ #define COMPAT_CIOCCRYPT       _IOWR('c', 104, struct compat_crypt_op)
+-#define COMPAT_CIOCKEY    _IOW('c', 105, struct compat_crypt_kop)
++#define COMPAT_CIOCKEY    _IOWR('c', 105, struct compat_crypt_kop)
+ #define COMPAT_CIOCASYNCCRYPT  _IOW('c', 107, struct compat_crypt_op)
+ #define COMPAT_CIOCASYNCFETCH  _IOR('c', 108, struct compat_crypt_op)
+ #define COMPAT_CIOCAUTHCRYPT   _IOWR('c', 109, struct compat_crypt_auth_op)
+-- 
+2.3.3
+
-- 
1.9.2

[PATCH 57/60] ipc: update to commit b010e35

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

New commits imported:
b010e35 Makefile: use KBUILD_OUTPUT to point to build-artifacts

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-extended/ipc-ust/ipc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/ipc-ust/ipc.inc b/recipes-extended/ipc-ust/ipc.inc
index 61b7976..f1dee08 100644
--- a/recipes-extended/ipc-ust/ipc.inc
+++ b/recipes-extended/ipc-ust/ipc.inc
@@ -1,6 +1,6 @@
 DEPENDS = "virtual/kernel"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;nobranch=1"
-SRCREV = "c9c92ac6a7a31c9d878096eb7d135c22a38f20ff"
+SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v1.9.x"
+SRCREV = "b010e35daf0a32ee45153fc76dd392949a3097a2"
 
 COMPATIBLE_MACHINE = "(bsc9132qds|bsc9131rdb|b4860qds|b4420qds)"
-- 
1.9.2

[PATCH 58/60] ipc-module: define SOC outside of do_compile

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

the SOC need to be availble for all tasks as it used in EXTRA_OEMAKE.
otherwise, make clean will break

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/kernel-modules/kernel-module-ipc.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index a496ab6..89330d1 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -9,6 +9,11 @@ inherit module qoriq_build_64bit_kernel
 
 S = "${WORKDIR}/git"
 
+SOC ?= ""
+SOC_b4 = "B4860"
+SOC_bsc9131 = "B913x"
+SOC_bsc9132 = "B913x"
+
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_configure_prepend() {
     sed -i 's,$(KERNEL_DIR)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/kernel/Makefile
@@ -16,10 +21,6 @@ do_configure_prepend() {
 
 do_compile_prepend () {
     cd ${S}/kernel
-    case ${MACHINE} in
-        bsc9132qds|bsc9131rdb) SOC=B913x;;
-        b4860qds|b4420qds) SOC=B4860;;
-    esac
 }
 
 INHIBIT_PACKAGE_STRIP = "1"
-- 
1.9.2

[PATCH 59/60] ipc-module: remove useless do_configure_preappend

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

The fix was merged in source code now.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/kernel-modules/kernel-module-ipc.inc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index 89330d1..f0a82d3 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -15,10 +15,6 @@ SOC_bsc9131 = "B913x"
 SOC_bsc9132 = "B913x"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
-do_configure_prepend() {
-    sed -i 's,$(KERNEL_DIR)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/kernel/Makefile
-}
-
 do_compile_prepend () {
     cd ${S}/kernel
 }
-- 
1.9.2

[PATCH 60/60] ipsec-demo: set COMPATIBLE_MACHINE as qoriq

[ting.liu]

From: Ting Liu <ting.liu@nxp.com>

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb b/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
index 8a90c76..be5b9f9 100644
--- a/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
+++ b/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
@@ -19,5 +19,4 @@ do_install(){
 }
 
 FILES_${PN} = "${datadir}/*"
-
-COMPATIBLE_MACHINE = "(qoriq-ppc)"
+COMPATIBLE_MACHINE = "(qoriq)"
-- 
1.9.2