All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3
@ 2016-08-01 22:53 Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 1/4] linux-imx: Upgrade to 4.1.15-1.1.1 Patch release Lauren Post
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Lauren Post @ 2016-08-01 22:53 UTC (permalink / raw)
  To: meta-freescale

Upgrade to 4.1.15-1.2.0 BSP

- Patch for 4.1.15.1.1.1 Kernel Patch release for i.MX 6 Ultra Lite EVK
- Patch for 4.1.15.1.2.0 release for i.MX 7Dual SABRE-SD
- New device tree for i.MX 7D
- Patches to fix build breaks with gcc6 and linux-imx kernel

Changes for v2 - Fix Local version to 1.2.0 in 4.1.15-1.2.0 linux-imx recipe
Changes for v3 - Add commit to kernel recipe update for 4.1.15-1.2.0

Lauren Post (4):
  linux-imx: Upgrade to 4.1.15-1.1.1 Patch release
  linux-imx: Upgrade to 4.1.15-1.2.0 i.MX 7Dual GA release
  imx7dsabresd: Add mipi-dsi device tree
  linux-imx: patches to file build errors with GCC6

 conf/machine/imx7dsabresd.conf                     |   2 +-
 .../imx/bcmhd_gcc6_indent_warning_error_fix.patch  |  28 ++
 .../linux-imx-4.1.15/imx/gcc6_integrate_fix.patch  | 369 +++++++++++++++++++++
 .../gpu-viv_gcc6_indent_warning_error_fix.patch    |  30 ++
 recipes-kernel/linux/linux-imx_4.1.15.bb           |   9 +-
 5 files changed, 435 insertions(+), 3 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/bcmhd_gcc6_indent_warning_error_fix.patch
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/gcc6_integrate_fix.patch
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/gpu-viv_gcc6_indent_warning_error_fix.patch

-- 
1.9.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [meta-fsl-arm][PATCH v3 1/4] linux-imx: Upgrade to 4.1.15-1.1.1 Patch release
  2016-08-01 22:53 [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3 Lauren Post
@ 2016-08-01 22:53 ` Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 2/4] linux-imx: Upgrade to 4.1.15-1.2.0 i.MX 7Dual GA release Lauren Post
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Lauren Post @ 2016-08-01 22:53 UTC (permalink / raw)
  To: meta-freescale

Support for i.MX 6UltraLite for 700Mhz

Signed-off-by: Lauren Post <lauren.post@nxp.com>
---
 recipes-kernel/linux/linux-imx_4.1.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_4.1.15.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb
index ccac488..90e9ed3 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15.bb
@@ -11,8 +11,8 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH = "imx_4.1.15_1.0.0_ga"
-LOCALVERSION = "-1.1.0"
-SRCREV = "a4d2a08f3bfc57ff5d7d1307fb23f52f1e681aca"
+LOCALVERSION = "-1.1.1"
+SRCREV = "d5d7c02d2fb59de6f61bb0962d08baecdf10c169"
 
 DEFAULT_PREFERENCE = "1"
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-fsl-arm][PATCH v3 2/4] linux-imx: Upgrade to 4.1.15-1.2.0 i.MX 7Dual GA release
  2016-08-01 22:53 [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3 Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 1/4] linux-imx: Upgrade to 4.1.15-1.1.1 Patch release Lauren Post
@ 2016-08-01 22:53 ` Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 3/4] imx7dsabresd: Add mipi-dsi device tree Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 4/4] linux-imx: patches to file build errors with GCC6 Lauren Post
  3 siblings, 0 replies; 5+ messages in thread
From: Lauren Post @ 2016-08-01 22:53 UTC (permalink / raw)
  To: meta-freescale

Update for i.MX 7Dual SabreSD T01.2 GA release

Signed-off-by: Lauren Post <lauren.post@nxp.com>
---
 recipes-kernel/linux/linux-imx_4.1.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_4.1.15.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb
index 90e9ed3..63dfcd0 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15.bb
@@ -11,8 +11,8 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH = "imx_4.1.15_1.0.0_ga"
-LOCALVERSION = "-1.1.1"
-SRCREV = "d5d7c02d2fb59de6f61bb0962d08baecdf10c169"
+LOCALVERSION = "-1.2.0"
+SRCREV = "77f61547834c4f127b44b13e43c59133a35880dc"
 
 DEFAULT_PREFERENCE = "1"
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-fsl-arm][PATCH v3 3/4] imx7dsabresd: Add mipi-dsi device tree
  2016-08-01 22:53 [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3 Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 1/4] linux-imx: Upgrade to 4.1.15-1.1.1 Patch release Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 2/4] linux-imx: Upgrade to 4.1.15-1.2.0 i.MX 7Dual GA release Lauren Post
@ 2016-08-01 22:53 ` Lauren Post
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 4/4] linux-imx: patches to file build errors with GCC6 Lauren Post
  3 siblings, 0 replies; 5+ messages in thread
From: Lauren Post @ 2016-08-01 22:53 UTC (permalink / raw)
  To: meta-freescale

MLK-12948 ARM: dts: imx7d-sdb: change the hardware reset gpio for mipi dsi

Change the hardware reset gpio to 'GPIO6_IO15' for mipi dsi to
allow fec2 and mipi dsi can run at the same time. This needs
some hardware rework as follows:
"
    1. Replace R631 with 100K resistor;
    2. Remove D14, D24;
    3. Solder the Cathode of the diode to R471,
       you can use BAT54HT1(ONSEMI) or NSR0320MW2T1G(ONSEMI);
    4. Solder the wire to the Anode end of the diode;
    5. Scrape the solder mask(Green oil)  of the MIPI Reset via,
       then solder the end of the wire to the via.

Signed-off-by: Lauren Post <lauren.post@nxp.com>
---
 conf/machine/imx7dsabresd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index b71bd4a..0bd6735 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES += " pci wifi bluetooth"
 SOC_FAMILY = "mx7:mx7d"
 
 KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
-                     imx7d-sdb-m4.dtb imx7d-sdb-qspi.dtb \
+                     imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
                      imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
                      imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
                      imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-fsl-arm][PATCH v3 4/4] linux-imx: patches to file build errors with GCC6
  2016-08-01 22:53 [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3 Lauren Post
                   ` (2 preceding siblings ...)
  2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 3/4] imx7dsabresd: Add mipi-dsi device tree Lauren Post
@ 2016-08-01 22:53 ` Lauren Post
  3 siblings, 0 replies; 5+ messages in thread
From: Lauren Post @ 2016-08-01 22:53 UTC (permalink / raw)
  To: meta-freescale

These patches fix build breaks caused by the compiler.h and
indentation warnings now treated as errors.

All of these patches will be included in next BSP release.

Signed-off-by: Lauren Post <lauren.post@nxp.com>
---
 .../imx/bcmhd_gcc6_indent_warning_error_fix.patch  |  28 ++
 .../linux-imx-4.1.15/imx/gcc6_integrate_fix.patch  | 369 +++++++++++++++++++++
 .../gpu-viv_gcc6_indent_warning_error_fix.patch    |  30 ++
 recipes-kernel/linux/linux-imx_4.1.15.bb           |   5 +
 4 files changed, 432 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/bcmhd_gcc6_indent_warning_error_fix.patch
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/gcc6_integrate_fix.patch
 create mode 100644 recipes-kernel/linux/linux-imx-4.1.15/imx/gpu-viv_gcc6_indent_warning_error_fix.patch

diff --git a/recipes-kernel/linux/linux-imx-4.1.15/imx/bcmhd_gcc6_indent_warning_error_fix.patch b/recipes-kernel/linux/linux-imx-4.1.15/imx/bcmhd_gcc6_indent_warning_error_fix.patch
new file mode 100644
index 0000000..4946930
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/bcmhd_gcc6_indent_warning_error_fix.patch
@@ -0,0 +1,28 @@
+From 86e5baf037a03464e56ee1edcebb598c43ffb1f6 Mon Sep 17 00:00:00 2001
+From: Lauren Post <lauren.post@nxp.com>
+Date: Wed, 13 Jul 2016 01:37:31 -0500
+Subject: [PATCH] bcmdhd: dhd_sdio: Fix indent for gcc 6.0 error
+
+Upstream-Status: Pending
+
+Signed-off-by: Lauren Post <lauren.post@nxp.com>
+---
+ drivers/net/wireless/bcmdhd/dhd_sdio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c
+index 8cb8796..09e1f32 100644
+--- a/drivers/net/wireless/bcmdhd/dhd_sdio.c
++++ b/drivers/net/wireless/bcmdhd/dhd_sdio.c
+@@ -8046,7 +8046,7 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
+ 			} else
+ 				bcmerror = BCME_SDIO_ERROR;
+ 
+-				dhd_os_sdunlock(dhdp);
++			dhd_os_sdunlock(dhdp);
+ 		} else {
+ 			bcmerror = BCME_SDIO_ERROR;
+ 			DHD_INFO(("%s called when dongle is not in reset\n",
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-imx-4.1.15/imx/gcc6_integrate_fix.patch b/recipes-kernel/linux/linux-imx-4.1.15/imx/gcc6_integrate_fix.patch
new file mode 100644
index 0000000..98f21e2
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/gcc6_integrate_fix.patch
@@ -0,0 +1,369 @@
+From e9809ecf104f0c584c9c00917037a864e9f2ffba Mon Sep 17 00:00:00 2001
+From: Joe Perches <joe@perches.com>
+Date: Thu, 25 Jun 2015 15:01:02 -0700
+Subject: [PATCH] compiler-gcc: integrate the various compiler-gcc[345].h files
+
+[ Upstream commit cb984d101b30eb7478d32df56a0023e4603cba7f ]
+
+As gcc major version numbers are going to advance rather rapidly in the
+future, there's no real value in separate files for each compiler
+version.
+
+Deduplicate some of the macros #defined in each file too.
+
+Neaten comments using normal kernel commenting style.
+
+Signed-off-by: Joe Perches <joe@perches.com>
+Cc: Andi Kleen <andi@firstfloor.org>
+Cc: Michal Marek <mmarek@suse.cz>
+Cc: Segher Boessenkool <segher@kernel.crashing.org>
+Cc: Sasha Levin <levinsasha928@gmail.com>
+Cc: Anton Blanchard <anton@samba.org>
+Cc: Alan Modra <amodra@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+(cherry picked from commit f320793e52aee78f0fbb8bcaf10e6614d2e67bfc)
+---
+ include/linux/compiler-gcc.h  | 120 ++++++++++++++++++++++++++++++++++++++++--
+ include/linux/compiler-gcc3.h |  23 --------
+ include/linux/compiler-gcc4.h |  91 --------------------------------
+ include/linux/compiler-gcc5.h |  67 -----------------------
+ 4 files changed, 116 insertions(+), 185 deletions(-)
+ delete mode 100644 include/linux/compiler-gcc3.h
+ delete mode 100644 include/linux/compiler-gcc4.h
+ delete mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index 371e560..484ef6e 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -115,10 +115,122 @@
+ #define __maybe_unused			__attribute__((unused))
+ #define __always_unused			__attribute__((unused))
+ 
+-#define __gcc_header(x) #x
+-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+-#define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
++/* gcc version specific checks */
++
++#if GCC_VERSION < 30200
++# error Sorry, your compiler is too old - please upgrade it.
++#endif
++
++#if GCC_VERSION < 30300
++# define __used			__attribute__((__unused__))
++#else
++# define __used			__attribute__((__used__))
++#endif
++
++#ifdef CONFIG_GCOV_KERNEL
++# if GCC_VERSION < 30400
++#   error "GCOV profiling support for gcc versions below 3.4 not included"
++# endif /* __GNUC_MINOR__ */
++#endif /* CONFIG_GCOV_KERNEL */
++
++#if GCC_VERSION >= 30400
++#define __must_check		__attribute__((warn_unused_result))
++#endif
++
++#if GCC_VERSION >= 40000
++
++/* GCC 4.1.[01] miscompiles __weak */
++#ifdef __KERNEL__
++# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
++#  error Your version of gcc miscompiles the __weak directive
++# endif
++#endif
++
++#define __used			__attribute__((__used__))
++#define __compiler_offsetof(a, b)					\
++	__builtin_offsetof(a, b)
++
++#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
++# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
++#endif
++
++#if GCC_VERSION >= 40300
++/* 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__ */
++#endif /* GCC_VERSION >= 40300 */
++
++#if GCC_VERSION >= 40500
++/*
++ * 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__))
++
++#endif /* GCC_VERSION >= 40500 */
++
++#if GCC_VERSION >= 40600
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible	__attribute__((externally_visible))
++#endif
++
++/*
++ * 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
++#if GCC_VERSION >= 40400
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#endif
++#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
++#define __HAVE_BUILTIN_BSWAP16__
++#endif
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
++
++#if GCC_VERSION >= 50000
++#define KASAN_ABI_VERSION 4
++#elif GCC_VERSION >= 40902
++#define KASAN_ABI_VERSION 3
++#endif
++
++#endif	/* gcc version >= 40000 specific checks */
+ 
+ #if !defined(__noclone)
+ #define __noclone	/* not needed */
+diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
+deleted file mode 100644
+index 7d89feb..0000000
+--- a/include/linux/compiler-gcc3.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-#if GCC_VERSION < 30200
+-# error Sorry, your compiler is too old - please upgrade it.
+-#endif
+-
+-#if GCC_VERSION >= 30300
+-# define __used			__attribute__((__used__))
+-#else
+-# define __used			__attribute__((__unused__))
+-#endif
+-
+-#if GCC_VERSION >= 30400
+-#define __must_check		__attribute__((warn_unused_result))
+-#endif
+-
+-#ifdef CONFIG_GCOV_KERNEL
+-# if GCC_VERSION < 30400
+-#   error "GCOV profiling support for gcc versions below 3.4 not included"
+-# endif /* __GNUC_MINOR__ */
+-#endif /* CONFIG_GCOV_KERNEL */
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+deleted file mode 100644
+index 769e198..0000000
+--- a/include/linux/compiler-gcc4.h
++++ /dev/null
+@@ -1,91 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-/* GCC 4.1.[01] miscompiles __weak */
+-#ifdef __KERNEL__
+-# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
+-#  error Your version of gcc miscompiles the __weak directive
+-# endif
+-#endif
+-
+-#define __used			__attribute__((__used__))
+-#define __must_check 		__attribute__((warn_unused_result))
+-#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
+-
+-#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
+-# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+-#endif
+-
+-#if GCC_VERSION >= 40300
+-/* 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__ */
+-#endif /* GCC_VERSION >= 40300 */
+-
+-#if GCC_VERSION >= 40500
+-/*
+- * 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__))
+-
+-#endif /* GCC_VERSION >= 40500 */
+-
+-#if GCC_VERSION >= 40600
+-/*
+- * Tell the optimizer that something else uses this function or variable.
+- */
+-#define __visible __attribute__((externally_visible))
+-#endif
+-
+-/*
+- * 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
+-#if GCC_VERSION >= 40400
+-#define __HAVE_BUILTIN_BSWAP32__
+-#define __HAVE_BUILTIN_BSWAP64__
+-#endif
+-#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
+-#define __HAVE_BUILTIN_BSWAP16__
+-#endif
+-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-
+-#if GCC_VERSION >= 40902
+-#define KASAN_ABI_VERSION 3
+-#endif
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+deleted file mode 100644
+index efee493..0000000
+--- a/include/linux/compiler-gcc5.h
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#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 */
+-
+-#define KASAN_ABI_VERSION 4
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-imx-4.1.15/imx/gpu-viv_gcc6_indent_warning_error_fix.patch b/recipes-kernel/linux/linux-imx-4.1.15/imx/gpu-viv_gcc6_indent_warning_error_fix.patch
new file mode 100644
index 0000000..b48606c
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/gpu-viv_gcc6_indent_warning_error_fix.patch
@@ -0,0 +1,30 @@
+From 8d0142efbfcfe4e3998f748496ceba62890c47f0 Mon Sep 17 00:00:00 2001
+From: Lauren Post <lauren.post@nxp.com>
+Date: Wed, 13 Jul 2016 03:07:23 -0500
+Subject: [PATCH] gpu-viv:  Fix gcc 6.0 indent warning error in gc_hal_kernel_platform_imx6ql4.c
+
+Upstream-Status: Pending
+
+Signed-off-by: Lauren Post <lauren.post@nxp.com>
+---
+ .../linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+index e436ada..d98c2f8 100644
+--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
++++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+@@ -475,8 +475,8 @@ gckPLATFORM_AdjustParam(
+ 
+     Args->gpu3DMinClock = initgpu3DMinClock;
+ 
+-  if(Args->physSize == 0)
+-    Args->physSize = 0x80000000;
++    if(Args->physSize == 0)
++        Args->physSize = 0x80000000;
+ 
+     return gcvSTATUS_OK;
+ }
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-imx_4.1.15.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb
index 63dfcd0..8fce40b 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15.bb
@@ -14,6 +14,11 @@ SRCBRANCH = "imx_4.1.15_1.0.0_ga"
 LOCALVERSION = "-1.2.0"
 SRCREV = "77f61547834c4f127b44b13e43c59133a35880dc"
 
+# Add patches for gcc 6 compiler issue
+SRC_URI += "file://gcc6_integrate_fix.patch \
+            file://bcmhd_gcc6_indent_warning_error_fix.patch \
+            file://gpu-viv_gcc6_indent_warning_error_fix.patch"
+
 DEFAULT_PREFERENCE = "1"
 
 COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-08-02 14:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-01 22:53 [meta-fsl-arm][PATCH v3 0/4] Upgrade to 4.1.15-1.2.0 BSP Patch v3 Lauren Post
2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 1/4] linux-imx: Upgrade to 4.1.15-1.1.1 Patch release Lauren Post
2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 2/4] linux-imx: Upgrade to 4.1.15-1.2.0 i.MX 7Dual GA release Lauren Post
2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 3/4] imx7dsabresd: Add mipi-dsi device tree Lauren Post
2016-08-01 22:53 ` [meta-fsl-arm][PATCH v3 4/4] linux-imx: patches to file build errors with GCC6 Lauren Post

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.