[meta-freescale] [meta-fsl-arm-extra PATCH 2/2] linux-congatec: Upgrade to an initial version based on linux-fslc-mx6
Otavio Salvador
otavio at ossystems.com.br
Mon Oct 26 11:11:15 PDT 2015
This updates the linux-congatec to an initial version based on
linux-fslc-mx6 fork. The kernel is based on 3.14.54 and includes all
3.14.28 GA release changes.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
...0001-ARM-imx6q-drop-unnecessary-semicolon.patch | 35 --------------
...lk-imx6q-fix-video-divider-for-rev-T0-1.0.patch | 40 ----------------
...Disable-imx6sl-specific-code-when-imx6sl-.patch | 56 ----------------------
.../defconfig | 0
recipes-kernel/linux/linux-congatec_3.14.28.bb | 23 ---------
recipes-kernel/linux/linux-congatec_3.14.bb | 19 ++++++++
6 files changed, 19 insertions(+), 154 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-congatec-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
delete mode 100644 recipes-kernel/linux/linux-congatec-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
delete mode 100644 recipes-kernel/linux/linux-congatec-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
rename recipes-kernel/linux/{linux-congatec-3.14.28 => linux-congatec-3.14}/defconfig (100%)
delete mode 100644 recipes-kernel/linux/linux-congatec_3.14.28.bb
create mode 100644 recipes-kernel/linux/linux-congatec_3.14.bb
diff --git a/recipes-kernel/linux/linux-congatec-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch b/recipes-kernel/linux/linux-congatec-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
deleted file mode 100644
index 8d43183..0000000
--- a/recipes-kernel/linux/linux-congatec-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5332a5467624b01d0c166309cd1dceac5f7b9d96 Mon Sep 17 00:00:00 2001
-From: Dmitry Voytik <voytikd at gmail.com>
-Date: Thu, 6 Nov 2014 22:46:20 +0400
-Subject: [PATCH 1/3] ARM: imx6q: drop unnecessary semicolon
-
-commit d2a10a1727b3948019128e83162f22c65859f1fd upstream.
-
-Drop unnecessary semicolon after closing curly bracket.
-
-Signed-off-by: Dmitry Voytik <voytikd at gmail.com>
-Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-
-Upstream-Status: Backport [3.14.29]
-
----
- arch/arm/mach-imx/clk-imx6q.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
-index f0d8000..a5107ab 100644
---- a/arch/arm/mach-imx/clk-imx6q.c
-+++ b/arch/arm/mach-imx/clk-imx6q.c
-@@ -149,7 +149,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
- post_div_table[2].div = 1;
- video_div_table[1].div = 1;
- video_div_table[2].div = 1;
-- };
-+ }
-
- clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
- clk[IMX6QDL_PLL2_BYPASS_SRC] = imx_clk_mux("pll2_bypass_src", base + 0x30, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
---
-2.1.4
-
diff --git a/recipes-kernel/linux/linux-congatec-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch b/recipes-kernel/linux/linux-congatec-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
deleted file mode 100644
index d7b852d..0000000
--- a/recipes-kernel/linux/linux-congatec-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5b9eb0cdaefd7ac8e31c1e1812582e0169ba9722 Mon Sep 17 00:00:00 2001
-From: Gary Bisson <bisson.gary at gmail.com>
-Date: Wed, 3 Dec 2014 15:03:51 -0800
-Subject: [PATCH 2/3] ARM: clk-imx6q: fix video divider for rev T0 1.0
-
-commit 81ef447950bf0955aca46f4a7617d8ce435cf0ce upstream.
-
-The post dividers do not work on i.MX6Q rev T0 1.0 so they must be fixed
-to 1. As the table index was wrong, a divider a of 4 could still be
-requested which implied the clock not to be set properly. This is the
-root cause of the HDMI not working at high resolution on rev T0 1.0 of
-the SoC.
-
-Signed-off-by: Gary Bisson <bisson.gary at gmail.com>
-Cc: <stable at vger.kernel.org>
-Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-
-Upstream-Status: Backport [3.14.29]
-
----
- arch/arm/mach-imx/clk-imx6q.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
-index a5107ab..cf060a9 100644
---- a/arch/arm/mach-imx/clk-imx6q.c
-+++ b/arch/arm/mach-imx/clk-imx6q.c
-@@ -148,7 +148,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
- post_div_table[1].div = 1;
- post_div_table[2].div = 1;
- video_div_table[1].div = 1;
-- video_div_table[2].div = 1;
-+ video_div_table[3].div = 1;
- }
-
- clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
---
-2.1.4
-
diff --git a/recipes-kernel/linux/linux-congatec-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/recipes-kernel/linux/linux-congatec-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
deleted file mode 100644
index 0743099..0000000
--- a/recipes-kernel/linux/linux-congatec-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 8340ad4ab71b568e65dfd1b92cc0967152887f97 Mon Sep 17 00:00:00 2001
-From: Nikolay Dimitrov <picmaster at mail.bg>
-Date: Sun, 8 Feb 2015 22:18:09 +0200
-Subject: [PATCH 3/3] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC
- support is disabled
-
-Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some
-hard-coded stuff. The patch purpose is to handle enabling/disabling this
-config option.
-
-Signed-off-by: Nikolay Dimitrov <picmaster at mail.bg>
-Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
-
-Upstream-Status: Pending
-
----
- arch/arm/mach-imx/Makefile | 3 ++-
- arch/arm/mach-imx/mxc.h | 4 ++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
-index b76a214..27f1976 100644
---- a/arch/arm/mach-imx/Makefile
-+++ b/arch/arm/mach-imx/Makefile
-@@ -122,7 +122,8 @@ obj-$(CONFIG_SOC_IMX6SL) += busfreq_lpddr2.o lpddr2_freq_imx6.o imx6sl_lpm_wfi.o
- AFLAGS_lpddr2_freq_imx6sx.o :=-Wa,-march=armv7-a
- AFLAGS_ddr3_freq_imx6sx.o :=-Wa,-march=armv7-a
- AFLAGS_imx6sx_low_power_idle.o :=-Wa,-march=armv7-a
--obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o
-+obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o \
-+ busfreq_lpddr2.o lpddr2_freq_imx6.o
- endif
-
-
-diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
-index 1510769..e6af4dd 100644
---- a/arch/arm/mach-imx/mxc.h
-+++ b/arch/arm/mach-imx/mxc.h
-@@ -158,10 +158,14 @@ extern unsigned int __mxc_cpu_type;
- #endif
-
- #ifndef __ASSEMBLY__
-+#ifdef CONFIG_SOC_IMX6SL
- static inline bool cpu_is_imx6sl(void)
- {
- return __mxc_cpu_type == MXC_CPU_IMX6SL;
- }
-+#else
-+# define cpu_is_imx6sl() (0)
-+#endif
-
- static inline bool cpu_is_imx6dl(void)
- {
---
-2.1.4
-
diff --git a/recipes-kernel/linux/linux-congatec-3.14.28/defconfig b/recipes-kernel/linux/linux-congatec-3.14/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-congatec-3.14.28/defconfig
rename to recipes-kernel/linux/linux-congatec-3.14/defconfig
diff --git a/recipes-kernel/linux/linux-congatec_3.14.28.bb b/recipes-kernel/linux/linux-congatec_3.14.28.bb
deleted file mode 100644
index e8298bb..0000000
--- a/recipes-kernel/linux/linux-congatec_3.14.28.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Congatec QMX6 Linux/kernel
-
-LICENSE = "GPLv2"
-
-require recipes-kernel/linux/linux-imx.inc
-require recipes-kernel/linux/linux-dtb.inc
-
-DEPENDS += "lzop-native bc-native"
-
-SRCBRANCH = "cgt_qmx6_3.14.28_1.0.0"
-
-SRC_URI = "git://git.congatec.com/arm/imx6_kernel_3.14.git;protocol=http;branch=${SRCBRANCH} \
- file://defconfig \
- file://0001-ARM-imx6q-drop-unnecessary-semicolon.patch \
- file://0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch \
- file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \
-"
-
-SRCREV = "644b0355a3f6324a1a24dd55bcdb4ead0d587d82"
-LOCALVERSION = "-1.0.0_qmx6"
-
-
-COMPATIBLE_MACHINE = "(cgtqmx6)"
diff --git a/recipes-kernel/linux/linux-congatec_3.14.bb b/recipes-kernel/linux/linux-congatec_3.14.bb
new file mode 100644
index 0000000..54fe6ae
--- /dev/null
+++ b/recipes-kernel/linux/linux-congatec_3.14.bb
@@ -0,0 +1,19 @@
+# Congatec QMX6 Linux/kernel
+
+LICENSE = "GPLv2"
+
+require recipes-kernel/linux/linux-imx.inc
+require recipes-kernel/linux/linux-dtb.inc
+
+DEPENDS += "lzop-native bc-native"
+
+SRCBRANCH = "cgt_qmx6_3.14-1.0.x-mx6_1.0.0"
+
+SRC_URI = "git://git.congatec.com/arm/imx6_kernel_3.14.git;protocol=http;branch=${SRCBRANCH} \
+ file://defconfig"
+
+SRCREV = "f5eee0b0b67b3021676dc9fd47cf95e1dd88b749"
+LOCALVERSION = "-1.0.x-mx6-qmx6"
+
+
+COMPATIBLE_MACHINE = "(cgtqmx6)"
--
2.6.1
More information about the meta-freescale
mailing list