[meta-freescale-layer][PATCH 00/12] Fixes for QorIQ platforms

[meta-freescale-layer][PATCH 00/12] Fixes for QorIQ platforms

[Zhenhua Luo]

Zhenhua Luo (12):
  ipsec-demo: Fix host contamination and build warning
  testfloat: get rid of 'No GNU_HASH in the elf binary' warning
  mux-server: Fix build warnings caused by external toolchain
  openssl/cryptodev: base_contains -> bb.utils.contains
  eth-config: fix host contamination warnings
  pkc-host: disable -Werror
  ipc-ust: skip two insane check
  skmm-ep: fix the build error caused by duplicated definition
  linux-qoriq: fix build issue under gcc6
  u-boot: fix build error under gcc6
  linux-qoriq: exclude DATETIME from vardepsexclude of ZIMAGE_BASE_NAME
    to fix taskhash mismatch issue
  README: add meta-openembedded as dependent layer

 README                                             |   4 +
 .../u-boot/files/fix-build-error-under-gcc6.patch  |  86 +++++++++++++++++
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb         |   1 +
 recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb  |   1 +
 recipes-connectivity/openssl/openssl-qoriq.inc     |   4 +-
 recipes-dpaa/eth-config/eth-config_git.bb          |   1 +
 recipes-extended/ipc-ust/ipc-ust_git.bb            |   3 +
 ...p-remove-duplicated-pa_to_va-and-va_to_pa.patch |  40 ++++++++
 recipes-extended/skmm-ep/skmm-ep_git.bb            |   1 +
 .../files/Yocto-replace-COMPILE_PREFIX-gcc.patch   |   2 +-
 recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc   |   2 +-
 recipes-kernel/linux/linux-qoriq.inc               |   1 +
 .../fix-the-compile-issue-under-gcc6.patch         | 103 +++++++++++++++++++++
 .../module-remove-MODULE_GENERIC_TABLE.patch       |  77 +++++++++++++++
 recipes-kernel/linux/linux-qoriq_3.12.bb           |   2 +
 recipes-kernel/pkc-host/pkc-host_git.bb            |   4 +
 ...001-Makefile-Fix-the-warning-during-build.patch |  31 +++++++
 .../mux-server/mux-server_1.02.bb                  |   4 +-
 18 files changed, 362 insertions(+), 5 deletions(-)
 create mode 100644 recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch
 create mode 100644 recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch
 create mode 100644 recipes-kernel/linux/linux-qoriq/fix-the-compile-issue-under-gcc6.patch
 create mode 100644 recipes-kernel/linux/linux-qoriq/module-remove-MODULE_GENERIC_TABLE.patch
 create mode 100644 recipes-virtualization/mux-server/mux-server/0001-Makefile-Fix-the-warning-during-build.patch

-- 
2.4.11

[meta-freescale-layer][PATCH 01/12] ipsec-demo: Fix host contamination and build warning

[Zhenhua Luo]

All files in the test_setkey directory are being copied with
ownership preserved (cp -a).

* Change ownership of all files in test_setkey directory to
  root:root

Signed-off-by: Noor <noor_ahsan@mentor.com>
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb b/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
index be5b9f9..f29c375 100644
--- a/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
+++ b/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb
@@ -16,6 +16,7 @@ do_compile[noexec] = "1"
 do_install(){
     install -d  ${D}${datadir}
     cp -a ${WORKDIR}/test_setkey ${D}${datadir}/
+    chown -R root:root ${D}${datadir}/test_setkey
 }
 
 FILES_${PN} = "${datadir}/*"
-- 
2.4.11

[meta-freescale-layer][PATCH 02/12] testfloat: get rid of 'No GNU_HASH in the elf binary' warning

[Zhenhua Luo]

Remove the warning caused by external toolchain like sourcery.
When used with sourcery toolchain warning was thrown during
the build.

Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch b/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch
index 42de56d..f2ff1c0 100644
--- a/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch
+++ b/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch
@@ -58,7 +58,7 @@ index de50aad..1a8b5f7 100644
 +COMPILE_SLOWFLOAT_C = $(CC) -c -o $@ $(INCLUDES) -I- -O
  
 -LINK = $(COMPILE_PREFIX)gcc -lm -o $@
-+LINK = $(CC) -lm -o $@
++LINK = $(CC) -lm -o $@ ${LDFLAGS}
  
  SOFTFLOAT_H = $(SOFTFLOAT_DIR)/softfloat.h
  SOFTFLOAT_OBJ = $(SOFTFLOAT_DIR)/softfloat$(OBJ)
-- 
2.4.11

[meta-freescale-layer][PATCH 03/12] mux-server: Fix build warnings caused by external toolchain

[Zhenhua Luo]

This patch resolves the warning:
| QA Issue: No GNU_HASH in the elf binary
| when built with external toolchain.

Signed-off-by: Sujith H <sujith.h@gmail.com>
Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 ...001-Makefile-Fix-the-warning-during-build.patch | 31 ++++++++++++++++++++++
 .../mux-server/mux-server_1.02.bb                  |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 recipes-virtualization/mux-server/mux-server/0001-Makefile-Fix-the-warning-during-build.patch

diff --git a/recipes-virtualization/mux-server/mux-server/0001-Makefile-Fix-the-warning-during-build.patch b/recipes-virtualization/mux-server/mux-server/0001-Makefile-Fix-the-warning-during-build.patch
new file mode 100644
index 0000000..32b0f19
--- /dev/null
+++ b/recipes-virtualization/mux-server/mux-server/0001-Makefile-Fix-the-warning-during-build.patch
@@ -0,0 +1,31 @@
+From bcb58c751a7ff82095642d2c9424a7ae18bca3c6 Mon Sep 17 00:00:00 2001
+From: Sujith Haridasan <Sujith_Haridasan@mentor.com>
+Date: Wed, 27 Apr 2016 16:49:09 +0530
+Subject: [PATCH] Makefile: Fix the warning during build
+
+Fix QA Issue: No GNU_HASH in the elf binary
+This warning is caused when built with external
+toolchain sourcery.
+
+Signed-off-by: Sujith H <sujith.h@gmail.com>
+Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c41030d..fa69b6f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ HOSTCC_OPTS_C= -Wall \
+ all: mux_server
+ 
+ mux_server: mux_server.c
+-	$(HOSTCC) $(HOSTCC_OPTS) $(HOSTCC_OPTS_C) -o $@ $< -lpthread
++	$(HOSTCC) $(HOSTCC_OPTS) $(HOSTCC_OPTS_C) -o $@ $< -lpthread ${LDFLAGS}
+ 
+ clean:
+ 	rm -f mux_server
+-- 
+1.9.1
+
diff --git a/recipes-virtualization/mux-server/mux-server_1.02.bb b/recipes-virtualization/mux-server/mux-server_1.02.bb
index 744a84c..83bafaa 100644
--- a/recipes-virtualization/mux-server/mux-server_1.02.bb
+++ b/recipes-virtualization/mux-server/mux-server_1.02.bb
@@ -3,7 +3,9 @@ SECTION = "mux-server"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/hypervisor/mux_server.git;branch=master"
+SRC_URI = "git://git.freescale.com/ppc/sdk/hypervisor/mux_server.git;branch=master \
+    file://0001-Makefile-Fix-the-warning-during-build.patch \
+"
 SRCREV = "3e4c6a44a81bb5cf2996830e8034d26850f80efc"
 
 S = "${WORKDIR}/git"
-- 
2.4.11

[meta-freescale-layer][PATCH 04/12] openssl/cryptodev: base_contains -> bb.utils.contains

[Zhenhua Luo]

base_contains is deprecated.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-connectivity/openssl/openssl-qoriq.inc   | 4 ++--
 recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index 894c1f0..faccb08 100644
--- a/recipes-connectivity/openssl/openssl-qoriq.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
@@ -49,7 +49,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl.so.*"
 FILES_${PN} =+ " ${libdir}/ssl/*"
 FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
-RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
+RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
 FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
 
 # Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
@@ -169,7 +169,7 @@ do_install () {
 	cp --dereference -R include/openssl ${D}${includedir}
 
 	oe_multilib_header openssl/opensslconf.h
-	if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
+	if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
 		install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
 		sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
 		sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
index aa0e994..e4700db 100644
--- a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
+++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
@@ -55,7 +55,7 @@ file://0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch \
 
 # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc
 # if pkc-host does not need customized cryptodev patches anymore
-SRC_URI_append = "${@base_contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}"
+SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}"
 
 S = "${WORKDIR}/cryptodev-linux-${PV}"
 
-- 
2.4.11

[meta-freescale-layer][PATCH 05/12] eth-config: fix host contamination warnings

[Zhenhua Luo]

Fix the following host contamination warnings:
| eth-config: /eth-config/xxx is owned by uid 1000, which is the same as
| the user running bitbake. This may be due to host contamination
| [host-user-contaminated]

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

diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb
index 9e69675..9269499 100644
--- a/recipes-dpaa/eth-config/eth-config_git.bb
+++ b/recipes-dpaa/eth-config/eth-config_git.bb
@@ -14,6 +14,7 @@ EXTRA_OEMAKE = "D=${D}"
 
 do_install() {
     oe_runmake install
+    chown -R root:root ${D}
 }
 
 CLEANBROKEN = "1"
-- 
2.4.11

[meta-freescale-layer][PATCH 06/12] pkc-host: disable -Werror

[Zhenhua Luo]

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

diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index 3343f19..bdee700 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -17,6 +17,10 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
+do_compile_prepend() {
+    sed -i 's#-Werror##g' ${S}/Makefile
+}
+
 do_install() {
     oe_runmake INSTALL_MOD_PATH="${D}" modules_install
     install -d ${D}/etc/crypto
-- 
2.4.11

[meta-freescale-layer][PATCH 07/12] ipc-ust: skip two insane check

[Zhenhua Luo]

Fix the following build issues:
1. WARNING: ipc-ust-git-r0 do_package_qa: QA Issue: /ipc/ipc_test contained in
   package ipc-ust requires libmem.so, but no providers found in
   RDEPENDS_ipc-ust? [file-rdeps]
2. ERROR: ipc-ust-git-r0 do_package_qa: QA Issue: -dev package contains
   non-symlink .so: ipc-ust-dev path
   'work/ppce6500-poky-linux/ipc-ust/git-r0/packages-split/ipc-ust-dev/lib/libipc.so'

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-extended/ipc-ust/ipc-ust_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb
index c39716b..23350b3 100644
--- a/recipes-extended/ipc-ust/ipc-ust_git.bb
+++ b/recipes-extended/ipc-ust/ipc-ust_git.bb
@@ -49,3 +49,6 @@ do_install () {
 FILES_${PN} += "${base_libdir}/*.so /ipc/*"
 FILES_${PN}-dev = "${includedir}"
 FILES_${PN}-dbg += "/ipc/.debug"
+
+INSANE_SKIP_${PN} += "file-rdeps"
+INSANE_SKIP_${PN}-dev += "dev-elf"
-- 
2.4.11

[meta-freescale-layer][PATCH 08/12] skmm-ep: fix the build error caused by duplicated definition

[Zhenhua Luo]

Remove the duplicated definition to fix the following build errors:
| apps/skmm/lib/skmm_sram.c:42:18: error: redefinition of 'pa_to_va'
| apps/skmm/lib/skmm_sram.c:51:20: error: redefinition of 'va_to_pa'

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 ...p-remove-duplicated-pa_to_va-and-va_to_pa.patch | 40 ++++++++++++++++++++++
 recipes-extended/skmm-ep/skmm-ep_git.bb            |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch

diff --git a/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch b/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch
new file mode 100644
index 0000000..afa7e89
--- /dev/null
+++ b/recipes-extended/skmm-ep/skmm-ep/skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch
@@ -0,0 +1,40 @@
+skmm-ep: remove duplicated definition
+
+Remove the duplicated definition to fix the following build errors:
+| apps/skmm/lib/skmm_sram.c:42:18: error: redefinition of 'pa_to_va'
+| apps/skmm/lib/skmm_sram.c:51:20: error: redefinition of 'va_to_pa'
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+
+diff --git a/apps/skmm/lib/skmm_sram.c b/apps/skmm/lib/skmm_sram.c
+index 2d84d93..6ab0421 100644
+--- a/apps/skmm/lib/skmm_sram.c
++++ b/apps/skmm/lib/skmm_sram.c
+@@ -39,24 +39,6 @@
+ static phys_addr_t sram_phys_addr;
+ static va_addr_t sram_virt_addr;
+ 
+-inline va_addr_t pa_to_va(phys_addr_t addr)
+-{
+-	va_addr_t offset;
+-
+-	offset = (va_addr_t)(addr - sram_phys_addr);
+-
+-	return sram_virt_addr + offset;
+-}
+-
+-inline phys_addr_t va_to_pa(va_addr_t addr)
+-{
+-	phys_addr_t offset;
+-
+-	offset = (phys_addr_t)(addr - sram_virt_addr);
+-
+-	return sram_phys_addr + offset;
+-}
+-
+ static int setup_law_for_plt_sram(phys_addr_t l2sram, u32 *size)
+ {
+ 	int fd;
+-- 
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 13d4c08..00466a6 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -10,6 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;nobranch=1 \
     file://add-two-missing-header-files.patch \
     file://skmm-ep-fix-the-inline-function-definition-with-gcc-.patch \
+    file://skmm-ep-remove-duplicated-pa_to_va-and-va_to_pa.patch \
 "
 SRCREV = "27156a6621c8f6d7f98210b1ca5cd97bde926875"
 
-- 
2.4.11

[meta-freescale-layer][PATCH 09/12] linux-qoriq: fix build issue under gcc6

[Zhenhua Luo]

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 .../fix-the-compile-issue-under-gcc6.patch         | 103 +++++++++++++++++++++
 .../module-remove-MODULE_GENERIC_TABLE.patch       |  77 +++++++++++++++
 recipes-kernel/linux/linux-qoriq_3.12.bb           |   2 +
 3 files changed, 182 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-qoriq/fix-the-compile-issue-under-gcc6.patch
 create mode 100644 recipes-kernel/linux/linux-qoriq/module-remove-MODULE_GENERIC_TABLE.patch

diff --git a/recipes-kernel/linux/linux-qoriq/fix-the-compile-issue-under-gcc6.patch b/recipes-kernel/linux/linux-qoriq/fix-the-compile-issue-under-gcc6.patch
new file mode 100644
index 0000000..910ef18
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq/fix-the-compile-issue-under-gcc6.patch
@@ -0,0 +1,103 @@
+Fix the compile issue under gcc6
+
+Fix the following build error:
+| .../include/linux/compiler-gcc.h:106:30: fatal error: linux/compiler-gcc6.h: No such file or directory
+| #include gcc_header(__GNUC__)
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+Upstream-Status: Pending
+---
+ arch/powerpc/kernel/Makefile  |  2 --
+ include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 66 insertions(+), 2 deletions(-)
+ create mode 100644 include/linux/compiler-gcc6.h
+
+diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
+index c326675..45f0494 100644
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
+@@ -4,8 +4,6 @@
+ 
+ CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
+ 
+-subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
+-
+ ifeq ($(CONFIG_PPC64),y)
+ CFLAGS_prom_init.o	+= $(NO_MINIMAL_TOC)
+ endif
+diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
+new file mode 100644
+index 0000000..cdd1cc2
+--- /dev/null
++++ b/include/linux/compiler-gcc6.h
+@@ -0,0 +1,66 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ * Fixed in GCC 4.8.2 and later versions.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+2.5.0
+
diff --git a/recipes-kernel/linux/linux-qoriq/module-remove-MODULE_GENERIC_TABLE.patch b/recipes-kernel/linux/linux-qoriq/module-remove-MODULE_GENERIC_TABLE.patch
new file mode 100644
index 0000000..5a67155
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq/module-remove-MODULE_GENERIC_TABLE.patch
@@ -0,0 +1,77 @@
+module: remove MODULE_GENERIC_TABLE
+
+MODULE_DEVICE_TABLE() calles MODULE_GENERIC_TABLE(); make it do the
+work directly.  This also removes a wart introduced in the last patch,
+where the alias is defined to be an unknown struct type "struct
+type##__##name##_device_id" instead of "struct type##_device_id" (it's
+an extern so GCC doesn't care, but it's wrong).
+
+The other user of MODULE_GENERIC_TABLE (ISAPNP_CARD_TABLE) is unused,
+so delete it.
+
+<Backport from cff26a51da5d206d3baf871e75778da44710219d>
+
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+Upstream-Status: Backport
+---
+ include/linux/isapnp.h |  4 ----
+ include/linux/module.h | 19 ++++++++-----------
+ 2 files changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h
+index e2d28b0..3c77bf9 100644
+--- a/include/linux/isapnp.h
++++ b/include/linux/isapnp.h
+@@ -56,10 +56,6 @@
+ #define ISAPNP_DEVICE_ID(_va, _vb, _vc, _function) \
+ 		{ .vendor = ISAPNP_VENDOR(_va, _vb, _vc), .function = ISAPNP_FUNCTION(_function) }
+ 
+-/* export used IDs outside module */
+-#define ISAPNP_CARD_TABLE(name) \
+-		MODULE_GENERIC_TABLE(isapnp_card, name)
+-
+ struct isapnp_card_id {
+ 	unsigned long driver_data;	/* data private to the driver */
+ 	unsigned short card_vendor, card_device;
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 54aef1b..a9f6812 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -83,15 +83,6 @@ void sort_extable(struct exception_table_entry *start,
+ void sort_main_extable(void);
+ void trim_init_extable(struct module *m);
+ 
+-#ifdef MODULE
+-#define MODULE_GENERIC_TABLE(gtype,name)			\
+-extern const struct gtype##_id __mod_##gtype##_table		\
+-  __attribute__ ((unused, alias(__stringify(name))))
+-
+-#else  /* !MODULE */
+-#define MODULE_GENERIC_TABLE(gtype,name)
+-#endif
+-
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
+ 
+@@ -142,8 +133,14 @@ extern const struct gtype##_id __mod_##gtype##_table		\
+ /* What your module does. */
+ #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
+ 
+-#define MODULE_DEVICE_TABLE(type,name)		\
+-  MODULE_GENERIC_TABLE(type##__##name##_device, name)
++#ifdef MODULE
++/* Creates an alias so file2alias.c can find device table. */
++#define MODULE_DEVICE_TABLE(type, name)                                        \
++  extern const struct type##_device_id __mod_##type##__##name##_device_table \
++  __attribute__ ((unused, alias(__stringify(name))))
++#else  /* !MODULE */
++#define MODULE_DEVICE_TABLE(type, name)
++#endif
+ 
+ /* Version of form [<epoch>:]<version>[-<extra-version>].
+    Or for CVS/RCS ID version, everything but the number is stripped.
+-- 
+2.5.0
+
diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb
index 0e6b8ab..37e088e 100644
--- a/recipes-kernel/linux/linux-qoriq_3.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_3.12.bb
@@ -7,6 +7,8 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \
     file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch \
     file://0003-use-static-inline-in-ARM-lifeboot.h.patch \
     file://0001-powerpc-Align-TOC-to-256-bytes.patch \
+    file://fix-the-compile-issue-under-gcc6.patch \
+    file://module-remove-MODULE_GENERIC_TABLE.patch \
 "
 
 SRCREV = "43cecda943a6c40a833b588801b0929e8bd48813"
-- 
2.4.11

[meta-freescale-layer][PATCH 10/12] u-boot: fix build error under gcc6

[Zhenhua Luo]

Fix the following build error under gcc6:
| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory
|  #include gcc_header(__GNUC__)

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 .../u-boot/files/fix-build-error-under-gcc6.patch  | 86 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb         |  1 +
 2 files changed, 87 insertions(+)
 create mode 100644 recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch

diff --git a/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch
new file mode 100644
index 0000000..839cd7d
--- /dev/null
+++ b/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch
@@ -0,0 +1,86 @@
+fix build error under gcc6
+
+Fix the following error:
+| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory
+|  #include gcc_header(__GNUC__)
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+Upstream-Status: Pending
+---
+ include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc6.h
+
+diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc6.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
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 bfea332..8b20b5a 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -26,6 +26,7 @@ SRCBRANCH = "sdk-v1.9.x"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \
     file://gcc5.patch \
     file://add-fgnu89-inline-option-for-gcc5.patch \
+    file://fix-build-error-under-gcc6.patch \
 "
 SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3"
 
-- 
2.4.11

[meta-freescale-layer][PATCH 11/12] linux-qoriq: exclude DATETIME from vardepsexclude of ZIMAGE_BASE_NAME to fix taskhash mismatch issue

[Zhenhua Luo]

The siggen.py checks the task hash, DATETIME dependency causes Taskhash
mismatch error, exxclude DATETIME variable from vardepsexclude of
ZIMAGE_BASE_NAME.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 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 6436d9c..a01798e 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -17,6 +17,7 @@ KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
+ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 
 SCMVERSION ?= "y"
 LOCALVERSION = ""
-- 
2.4.11

[meta-freescale-layer][PATCH 12/12] README: add meta-openembedded as dependent layer

[Zhenhua Luo]

Some recipes depends oon meta-openembedded layer.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index 33d4c08..3acda92 100644
--- a/README
+++ b/README
@@ -10,6 +10,10 @@ URI: git://git.openembedded.org/openembedded-core
 branch: master
 revision: HEAD
 
+URI: git://git.openembedded.org/meta-openembedded
+branch: master
+revision: HEAD
+
 Contributing
 ------------
 
-- 
2.4.11

Re: [meta-freescale-layer][PATCH 12/12] README: add meta-openembedded as dependent layer

[Otavio Salvador]

On Fri, Jun 3, 2016 at 4:49 AM, Zhenhua Luo <zhenhua.luo@nxp.com> wrote:
> Some recipes depends oon meta-openembedded layer.
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>

Please move the recipes which depends on meta-oe for the dynamic
layer. We should not require meta-oe.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750