[meta-fsl-arm][PATCH 1/5] asf: correct the branch

[meta-fsl-arm][PATCH 1/5] asf: correct the branch

[Zhenhua Luo]

Fix the following build error:
| asf-git-r0 do_fetch: Fetcher failure: Unable to find revision
| 62ba10ab6bab8f8f53934e4bb55b5a552bf3fd6b in branch master even from upstream

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

diff --git a/openembedded-layer/recipes-kernel/asf/asf_git.bb b/openembedded-layer/recipes-kernel/asf/asf_git.bb
index 7cf8f57..97cbcc9 100644
--- a/openembedded-layer/recipes-kernel/asf/asf_git.bb
+++ b/openembedded-layer/recipes-kernel/asf/asf_git.bb
@@ -3,7 +3,7 @@ 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"
+SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v1.8.x"
 SRCREV = "62ba10ab6bab8f8f53934e4bb55b5a552bf3fd6b"
 
 inherit module
-- 
2.4.11

[meta-fsl-arm][PATCH 2/5] linux-ls1: fix build issue under gcc6

[Zhenhua Luo]

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-kernel/linux/linux-ls1.inc                 |  1 +
 .../Fix-the-compile-issue-under-gcc6.patch         | 92 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch

diff --git a/recipes-kernel/linux/linux-ls1.inc b/recipes-kernel/linux/linux-ls1.inc
index a1007b8..85b5391 100644
--- a/recipes-kernel/linux/linux-ls1.inc
+++ b/recipes-kernel/linux/linux-ls1.inc
@@ -12,6 +12,7 @@ SRC_URI += " \
     file://0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
     file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch \
     file://0003-use-static-inline-in-ARM-lifeboot.h.patch \
+    file://Fix-the-compile-issue-under-gcc6.patch \
 "
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
diff --git a/recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch b/recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch
new file mode 100644
index 0000000..3d080b6
--- /dev/null
+++ b/recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch
@@ -0,0 +1,92 @@
+From 5d39bd421fc093e2c852316080538cef85a9e1a0 Mon Sep 17 00:00:00 2001
+From: yocto <yocto@yocto.org>
+Date: Thu, 2 Jun 2016 00:18:33 -0500
+Subject: [PATCH] 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
+---
+ include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 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..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
+
-- 
2.4.11

[meta-fsl-arm][PATCH 3/5] qemu-fsl: remove unsupported configure options

[Zhenhua Luo]

Fix the following errors:
| DEBUG: Executing shell function do_configure
| ERROR: unknown option --disable-static
| ERROR: unknown option --disable-gnutls
| ERROR: unknown option --disable-gcrypt
| ERROR: unknown option --disable-nettle
| ERROR: unknown option --disable-smartcard

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
index 94fb9b1..28e06f9 100644
--- a/recipes-devtools/qemu/qemu-fsl_git.bb
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -12,12 +12,19 @@ PV = "2.2.0+${SRCPV}"
 # to qemu 2.3:
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
 
+# remove not supported PACKAGECONFIG by this v2.2.0 based recipe
+PACKAGECONFIG[gcrypt] = ""
+PACKAGECONFIG[gnutls] = ""
+PACKAGECONFIG[nettle] = ""
+PACKAGECONFIG[nss] = ""
+
 SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
 SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
 
 S = "${WORKDIR}/git"
 
 QEMU_TARGETS = "arm"
+DISABLE_STATIC = ""
 
 inherit pkgconfig
 
-- 
2.4.11

[meta-fsl-arm][PATCH 4/5] qemu-fsl: disable do_compile_ptest_base execution

[Zhenhua Luo]

This qemu doesn't support ptest, do disable do_compile_ptest_base.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
index 28e06f9..e049b90 100644
--- a/recipes-devtools/qemu/qemu-fsl_git.bb
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -28,6 +28,8 @@ DISABLE_STATIC = ""
 
 inherit pkgconfig
 
+do_compile_ptest_base[noexec] = "1"
+
 # Append build host pkg-config paths for native target since the host may provide sdl
 do_configure_prepend() {
     export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
-- 
2.4.11

[meta-fsl-arm][PATCH 5/5] 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-ls1/fix-build-error-under-gcc6.patch    | 91 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb           |  4 +-
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1/fix-build-error-under-gcc6.patch

diff --git a/recipes-bsp/u-boot/u-boot-ls1/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/u-boot-ls1/fix-build-error-under-gcc6.patch
new file mode 100644
index 0000000..18c5e74
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1/fix-build-error-under-gcc6.patch
@@ -0,0 +1,91 @@
+From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001
+From: yocto <yocto@yocto.org>
+Date: Thu, 2 Jun 2016 03:21:51 -0500
+Subject: [PATCH] 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 */
+-- 
+2.5.0
+
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
index ae31763..2695c14 100644
--- a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = " \
 
 SRCBRANCH = "master"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRC_URI += "file://0001-uboot-support-gcc5.patch "
+SRC_URI += "file://0001-uboot-support-gcc5.patch \
+    file://fix-build-error-under-gcc6.patch \
+"
 SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
 
 LOCALVERSION ?= "+ls1"
-- 
2.4.11