mirror of
https://github.com/Freescale/meta-freescale-3rdparty.git
synced 2025-07-19 12:09:01 +02:00
linux-congatec: Bump kernel to 4.1.15_2.0.0
Kernel based on NXP 4.1.15_2.0.0_ga Signed-off-by: Alex de Cabo <alejandro.de-cabo-garcia@congatec.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Alex de Cabo
Otavio Salvador
parent
d682a66e3c
commit
7cf4a42cc1
|
|
@ -0,0 +1,36 @@
|
|||
From 8a1fbfd7f93b635223525f4932a4d5f31d6735ce Mon Sep 17 00:00:00 2001
|
||||
From: Alex de Cabo <alejandro.de-cabo-garcia@congatec.com>
|
||||
Date: Fri, 10 Feb 2017 08:53:23 +0100
|
||||
Subject: [PATCH] imx6qdl-qmx6: Change bit color depth and pix format
|
||||
|
||||
Change the default color depth and pix format to be suitable
|
||||
with the LVDS-to-DVI adaptor present in the Conga-QKIT
|
||||
---
|
||||
arch/arm/boot/dts/imx6qdl-qmx6.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-qmx6.dtsi b/arch/arm/boot/dts/imx6qdl-qmx6.dtsi
|
||||
index 759e066..10d27be 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-qmx6.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-qmx6.dtsi
|
||||
@@ -330,7 +330,7 @@
|
||||
mxcfb1: fb@0 {
|
||||
compatible = "fsl,mxc_sdc_fb";
|
||||
disp_dev = "ldb";
|
||||
- interface_pix_fmt = "RGB666";
|
||||
+ interface_pix_fmt = "RGB24";
|
||||
default_bpp = <16>;
|
||||
int_clk = <0>;
|
||||
late_init = <0>;
|
||||
@@ -752,7 +752,7 @@
|
||||
|
||||
lvds-channel@0 {
|
||||
fsl,data-mapping = "spwg";
|
||||
- fsl,data-width = <18>;
|
||||
+ fsl,data-width = <24>;
|
||||
primary;
|
||||
status = "okay";
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ CONFIG_SOC_IMX53=y
|
|||
CONFIG_SOC_IMX6Q=y
|
||||
CONFIG_SOC_IMX6SL=y
|
||||
CONFIG_SOC_IMX6SX=y
|
||||
CONFIG_SOC_IMX6UL=y
|
||||
CONFIG_SOC_IMX6ULL=y
|
||||
CONFIG_SOC_IMX7D=y
|
||||
CONFIG_SOC_VF610=y
|
||||
# CONFIG_SWP_EMULATE is not set
|
||||
|
|
@ -146,8 +146,8 @@ CONFIG_USB_USBNET=m
|
|||
CONFIG_USB_NET_CDC_EEM=m
|
||||
CONFIG_BCMDHD=m
|
||||
CONFIG_BCMDHD_SDIO=y
|
||||
CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
|
||||
CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
|
||||
CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin"
|
||||
CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal"
|
||||
# CONFIG_RTL_CARDS is not set
|
||||
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
||||
CONFIG_INPUT_EVDEV=y
|
||||
|
|
@ -178,6 +178,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
|
|||
CONFIG_SERIAL_FSL_LPUART=y
|
||||
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
|
||||
CONFIG_FSL_OTP=y
|
||||
CONFIG_HW_RANDOM_IMX_RNG=y
|
||||
# CONFIG_I2C_COMPAT is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX_GPIO=y
|
||||
|
|
@ -404,7 +405,6 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
CONFIG_SECURITYFS=y
|
||||
CONFIG_CRYPTO_USER=y
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
CONFIG_CRYPTO_CBC=y
|
||||
CONFIG_CRYPTO_CTS=y
|
||||
CONFIG_CRYPTO_LRW=y
|
||||
CONFIG_CRYPTO_XTS=y
|
||||
|
|
@ -415,7 +415,6 @@ CONFIG_CRYPTO_RMD128=y
|
|||
CONFIG_CRYPTO_RMD160=y
|
||||
CONFIG_CRYPTO_RMD256=y
|
||||
CONFIG_CRYPTO_RMD320=y
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_SHA512=y
|
||||
CONFIG_CRYPTO_TGR192=y
|
||||
CONFIG_CRYPTO_WP512=y
|
||||
|
|
@ -428,6 +427,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=y
|
|||
CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
|
||||
CONFIG_CRYPTO_DEV_MXS_DCP=y
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC7=m
|
||||
|
|
@ -435,3 +435,4 @@ CONFIG_LIBCRC32C=m
|
|||
CONFIG_FONTS=y
|
||||
CONFIG_FONT_8x8=y
|
||||
CONFIG_FONT_8x16=y
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -7,15 +7,14 @@ require recipes-kernel/linux/linux-dtb.inc
|
|||
|
||||
DEPENDS += "lzop-native bc-native"
|
||||
|
||||
SRCBRANCH = "cgt_imx6_4.1.15_1.2.0"
|
||||
SRCBRANCH = "cgt_imx6_4.1.15_2.0.0"
|
||||
|
||||
SRC_URI = "git://git.congatec.com/arm/imx6_kernel_4.1.git;protocol=http;branch=${SRCBRANCH} \
|
||||
file://defconfig \
|
||||
file://Fix-the-compile-issue-under-gcc6.patch \
|
||||
file://gpu-viv_gcc6_indent_warning_error_fix.patch \
|
||||
file://0001-imx6qdl-qmx6-Change-bit-color-depth-and-pix-format.patch \
|
||||
"
|
||||
|
||||
SRCREV = "d83cc3c81cb13212c62822822e08c7e6da75eec6"
|
||||
#LOCALVERSION = "-1.2.0_cgt-imx6"
|
||||
SRCREV = "bdea10a64bdbc411e4a2ed4d6b9578919a148083"
|
||||
#LOCALVERSION = "-2.0.0_cgt-imx6"
|
||||
|
||||
COMPATIBLE_MACHINE = "(cgtqmx6|cgtumx6|cgtimx6)"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user