summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch35
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch35
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-fix-build.patch (renamed from meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch)30
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch40
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-fix-build-with-rt-enabled.patch (renamed from meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch)0
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch56
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-no-split-ptlocks.patch (renamed from meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0003-no-split-ptlocks.patch)19
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch36
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch100
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/mx6/defconfig (renamed from meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/defconfig)102
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.31.bb27
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.14.28.bb31
12 files changed, 405 insertions, 106 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
deleted file mode 100644
index 820ce68e..00000000
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 0e981452d7130513e796c1c3d7348905c0d00dce Mon Sep 17 00:00:00 2001
2From: Gary Bisson <bisson.gary@gmail.com>
3Date: Tue, 2 Dec 2014 22:11:14 -0800
4Subject: [PATCH] ARM: clk-imx6q: fix video divider for revision 1.0 of i.MX6q
5
6As post dividers do not work on i.MX6Q revision 1.0 they must be fixed
7to 1. As the table index was wrong, a divider a of 4 could still be
8requested which implied the clock not to be set properly. This is the
9root cause of the HDMI not working at high resolution on T1.0 version of
10the SoC, giving the following error:
11mxc_sdc_fb fb.27: timeout when waiting for flip irq
12
13Upstream-Status: Pending
14
15Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
16---
17 arch/arm/mach-imx/clk-imx6q.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
21index 25734ed..34e1616f 100644
22--- a/arch/arm/mach-imx/clk-imx6q.c
23+++ b/arch/arm/mach-imx/clk-imx6q.c
24@@ -312,7 +312,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
25 post_div_table[1].div = 1;
26 post_div_table[2].div = 1;
27 video_div_table[1].div = 1;
28- video_div_table[2].div = 1;
29+ video_div_table[3].div = 1;
30 };
31
32 /* type name parent_name base div_mask */
33--
342.1.3
35
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
new file mode 100644
index 00000000..8d431832
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
@@ -0,0 +1,35 @@
1From 5332a5467624b01d0c166309cd1dceac5f7b9d96 Mon Sep 17 00:00:00 2001
2From: Dmitry Voytik <voytikd@gmail.com>
3Date: Thu, 6 Nov 2014 22:46:20 +0400
4Subject: [PATCH 1/3] ARM: imx6q: drop unnecessary semicolon
5
6commit d2a10a1727b3948019128e83162f22c65859f1fd upstream.
7
8Drop unnecessary semicolon after closing curly bracket.
9
10Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
11Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
12Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
13
14Upstream-Status: Backport [3.14.29]
15
16---
17 arch/arm/mach-imx/clk-imx6q.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
21index f0d8000..a5107ab 100644
22--- a/arch/arm/mach-imx/clk-imx6q.c
23+++ b/arch/arm/mach-imx/clk-imx6q.c
24@@ -149,7 +149,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
25 post_div_table[2].div = 1;
26 video_div_table[1].div = 1;
27 video_div_table[2].div = 1;
28- };
29+ }
30
31 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));
32 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));
33--
342.1.4
35
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-fix-build.patch
index ffc6b74f..4be4066d 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0001-fix-build.patch
@@ -4,12 +4,13 @@ Upstream-Status: Inappropriate [other]
4Freescale does not support the RT patch 4Freescale does not support the RT patch
5 5
6Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> 6Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
7Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> [updated for 3.14.28]
7 8
8Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 9diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
9=================================================================== 10index 2ec98dc..5d0b7df 100644
10--- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 11--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
11+++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 12+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
12@@ -7746,7 +7746,7 @@ gckOS_WaitSignal( 13@@ -7344,7 +7344,7 @@ gckOS_WaitSignal(
13 14
14 might_sleep(); 15 might_sleep();
15 16
@@ -18,7 +19,7 @@ Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
18 19
19 if (signal->obj.done) 20 if (signal->obj.done)
20 { 21 {
21@@ -7768,9 +7768,8 @@ gckOS_WaitSignal( 22@@ -7366,9 +7366,8 @@ gckOS_WaitSignal(
22 ? MAX_SCHEDULE_TIMEOUT 23 ? MAX_SCHEDULE_TIMEOUT
23 : Wait * HZ / 1000; 24 : Wait * HZ / 1000;
24 25
@@ -30,7 +31,7 @@ Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
30 31
31 while (gcvTRUE) 32 while (gcvTRUE)
32 { 33 {
33@@ -7782,9 +7781,9 @@ gckOS_WaitSignal( 34@@ -7380,9 +7379,9 @@ gckOS_WaitSignal(
34 } 35 }
35 36
36 __set_current_state(TASK_INTERRUPTIBLE); 37 __set_current_state(TASK_INTERRUPTIBLE);
@@ -42,7 +43,7 @@ Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
42 43
43 if (signal->obj.done) 44 if (signal->obj.done)
44 { 45 {
45@@ -7805,10 +7804,10 @@ gckOS_WaitSignal( 46@@ -7403,10 +7402,10 @@ gckOS_WaitSignal(
46 } 47 }
47 } 48 }
48 49
@@ -55,3 +56,16 @@ Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
55 56
56 OnError: 57 OnError:
57 /* Return status. */ 58 /* Return status. */
59diff --git a/include/linux/imx_sema4.h b/include/linux/imx_sema4.h
60index 9787980..3586199 100644
61--- a/include/linux/imx_sema4.h
62+++ b/include/linux/imx_sema4.h
63@@ -9,6 +9,8 @@
64 #ifndef __LINUX_IMX_SEMA4_H__
65 #define __LINUX_IMX_SEMA4_H__
66
67+#include <linux/wait.h>
68+
69 #define SEMA4_NUM_DEVICES 1
70 #define SEMA4_NUM_GATES 16
71
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
new file mode 100644
index 00000000..d7b852da
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
@@ -0,0 +1,40 @@
1From 5b9eb0cdaefd7ac8e31c1e1812582e0169ba9722 Mon Sep 17 00:00:00 2001
2From: Gary Bisson <bisson.gary@gmail.com>
3Date: Wed, 3 Dec 2014 15:03:51 -0800
4Subject: [PATCH 2/3] ARM: clk-imx6q: fix video divider for rev T0 1.0
5
6commit 81ef447950bf0955aca46f4a7617d8ce435cf0ce upstream.
7
8The post dividers do not work on i.MX6Q rev T0 1.0 so they must be fixed
9to 1. As the table index was wrong, a divider a of 4 could still be
10requested which implied the clock not to be set properly. This is the
11root cause of the HDMI not working at high resolution on rev T0 1.0 of
12the SoC.
13
14Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
15Cc: <stable@vger.kernel.org>
16Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
17Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18
19Upstream-Status: Backport [3.14.29]
20
21---
22 arch/arm/mach-imx/clk-imx6q.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
26index a5107ab..cf060a9 100644
27--- a/arch/arm/mach-imx/clk-imx6q.c
28+++ b/arch/arm/mach-imx/clk-imx6q.c
29@@ -148,7 +148,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
30 post_div_table[1].div = 1;
31 post_div_table[2].div = 1;
32 video_div_table[1].div = 1;
33- video_div_table[2].div = 1;
34+ video_div_table[3].div = 1;
35 }
36
37 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));
38--
392.1.4
40
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-fix-build-with-rt-enabled.patch
index 83652c96..83652c96 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0002-fix-build-with-rt-enabled.patch
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
new file mode 100644
index 00000000..0743099f
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
@@ -0,0 +1,56 @@
1From 8340ad4ab71b568e65dfd1b92cc0967152887f97 Mon Sep 17 00:00:00 2001
2From: Nikolay Dimitrov <picmaster@mail.bg>
3Date: Sun, 8 Feb 2015 22:18:09 +0200
4Subject: [PATCH 3/3] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC
5 support is disabled
6
7Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some
8hard-coded stuff. The patch purpose is to handle enabling/disabling this
9config option.
10
11Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13
14Upstream-Status: Pending
15
16---
17 arch/arm/mach-imx/Makefile | 3 ++-
18 arch/arm/mach-imx/mxc.h | 4 ++++
19 2 files changed, 6 insertions(+), 1 deletion(-)
20
21diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
22index b76a214..27f1976 100644
23--- a/arch/arm/mach-imx/Makefile
24+++ b/arch/arm/mach-imx/Makefile
25@@ -122,7 +122,8 @@ obj-$(CONFIG_SOC_IMX6SL) += busfreq_lpddr2.o lpddr2_freq_imx6.o imx6sl_lpm_wfi.o
26 AFLAGS_lpddr2_freq_imx6sx.o :=-Wa,-march=armv7-a
27 AFLAGS_ddr3_freq_imx6sx.o :=-Wa,-march=armv7-a
28 AFLAGS_imx6sx_low_power_idle.o :=-Wa,-march=armv7-a
29-obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o
30+obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o \
31+ busfreq_lpddr2.o lpddr2_freq_imx6.o
32 endif
33
34
35diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
36index 1510769..e6af4dd 100644
37--- a/arch/arm/mach-imx/mxc.h
38+++ b/arch/arm/mach-imx/mxc.h
39@@ -158,10 +158,14 @@ extern unsigned int __mxc_cpu_type;
40 #endif
41
42 #ifndef __ASSEMBLY__
43+#ifdef CONFIG_SOC_IMX6SL
44 static inline bool cpu_is_imx6sl(void)
45 {
46 return __mxc_cpu_type == MXC_CPU_IMX6SL;
47 }
48+#else
49+# define cpu_is_imx6sl() (0)
50+#endif
51
52 static inline bool cpu_is_imx6dl(void)
53 {
54--
552.1.4
56
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0003-no-split-ptlocks.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-no-split-ptlocks.patch
index b7995b63..40c012a5 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/0003-no-split-ptlocks.patch
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0003-no-split-ptlocks.patch
@@ -3,6 +3,7 @@ Work around the oops below by disabling split ptlocks
3Upstream-Status: Inappropriate [disable feature] 3Upstream-Status: Inappropriate [disable feature]
4 4
5Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> 5Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
6Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> [updated for 3.14.28]
6 7
7Unable to handle kernel NULL pointer dereference at virtual address 00000000 8Unable to handle kernel NULL pointer dereference at virtual address 00000000
8pgd = ac5a8000 9pgd = ac5a8000
@@ -69,16 +70,16 @@ Code: e92d4010 e1a04000 e3a00001 ebe8abd7 (e1943f9f)
69---[ end trace 0000000000000002 ]--- 70---[ end trace 0000000000000002 ]---
70note: test-qt5[277] exited with preempt_count 1 71note: test-qt5[277] exited with preempt_count 1
71 72
72Index: git/include/linux/mm_types.h 73diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
73=================================================================== 74index 6c1dc6c..8c00faf 100644
74--- git.orig/include/linux/mm_types.h 75--- a/include/linux/mm_types.h
75+++ git/include/linux/mm_types.h 76+++ b/include/linux/mm_types.h
76@@ -24,7 +24,7 @@ 77@@ -24,7 +24,7 @@
77 78
78 struct address_space; 79 struct address_space;
79 80
80-#define USE_SPLIT_PTLOCKS (NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS) 81-#define USE_SPLIT_PTE_PTLOCKS (NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS)
81+#define USE_SPLIT_PTLOCKS (0) 82+#define USE_SPLIT_PTE_PTLOCKS (0)
82 83 #define USE_SPLIT_PMD_PTLOCKS (USE_SPLIT_PTE_PTLOCKS && \
83 /* 84 IS_ENABLED(CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK))
84 * Each physical page in the system has a struct page associated with 85 #define ALLOC_SPLIT_PTLOCKS (SPINLOCK_SIZE > BITS_PER_LONG/8)
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch
new file mode 100644
index 00000000..0d3caa40
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch
@@ -0,0 +1,36 @@
1From 77903c01d8c6c5d2544085ba074aceadc1191d21 Mon Sep 17 00:00:00 2001
2From: Ulf Hansson <ulf.hansson@linaro.org>
3Date: Thu, 11 Dec 2014 15:12:25 +0100
4Subject: [PATCH 2/2] mmc: sdhci-esdhc-imx: Fixup runtime PM conditions during
5 ->probe()
6
7By configure runtime PM prior we enable the use of it, we close the gap
8for strange and unhandled conditions. Moreover it makes us rely on the
9driver core, after finalized ->probe(), to request an inactive device
10to become runtime PM idle/suspended, which earlier potentially could
11happen already at pm_runtime_set_autosuspend_delay().
12
13Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
14---
15 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
19index 043866c..10ef824 100644
20--- a/drivers/mmc/host/sdhci-esdhc-imx.c
21+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
22@@ -1080,10 +1080,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
23 goto disable_clk;
24
25 pm_runtime_set_active(&pdev->dev);
26- pm_runtime_enable(&pdev->dev);
27 pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
28 pm_runtime_use_autosuspend(&pdev->dev);
29 pm_suspend_ignore_children(&pdev->dev, 1);
30+ pm_runtime_enable(&pdev->dev);
31
32 return 0;
33
34--
351.9.3
36
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch
new file mode 100644
index 00000000..5e5721cf
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch
@@ -0,0 +1,100 @@
1From a2fe37b69d4fe369c284d50927193fed81c238a0 Mon Sep 17 00:00:00 2001
2From: Fabio Estevam <fabio.estevam@freescale.com>
3Date: Fri, 13 Mar 2015 14:07:54 -0300
4Subject: [PATCH] Revert "net: fec: fix the warning found by dma debug"
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This reverts commit 2b995f63987013bacde99168218f9c7b252bdcf1.
10
11????? ?????? reported the following regression:
12
13"Commit 2b995f63987013bacde99168218f9c7b252bdcf1 in 4.0.0-rc3 introduces a
14nasty bug in transmit, corrupting packets.
15
16To reproduce:
17
18$ dd if=/dev/zero of=zeros bs=1M count=20
19$ md5sum -b zeros
208f4e33f3dc3e414ff94e5fb6905cba8c *zeros
21
22This checksum is correct.
23
24Copy file "zeros" to another host with NFS, and it gets corrupted, checksum is
25changed.
26File should be big, small amounts of transmit isn't affected.
27
28I use an i.MX6 Quad board.
29
30If this commit is reverted, all works fine."
31
32Reported-by: ????? ?????? <rockford@yandex.ru>
33Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
34Signed-off-by: David S. Miller <davem@davemloft.net>
35---
36 drivers/net/ethernet/freescale/fec_main.c | 34 ++++++++++---------------------
37 1 file changed, 11 insertions(+), 23 deletions(-)
38
39diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
40index 787db50..78e1ce0 100644
41--- a/drivers/net/ethernet/freescale/fec_main.c
42+++ b/drivers/net/ethernet/freescale/fec_main.c
43@@ -1189,13 +1189,12 @@ static void
44 fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
45 {
46 struct fec_enet_private *fep;
47- struct bufdesc *bdp, *bdp_t;
48+ struct bufdesc *bdp;
49 unsigned short status;
50 struct sk_buff *skb;
51 struct fec_enet_priv_tx_q *txq;
52 struct netdev_queue *nq;
53 int index = 0;
54- int i, bdnum;
55 int entries_free;
56
57 fep = netdev_priv(ndev);
58@@ -1216,29 +1215,18 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
59 if (bdp == txq->cur_tx)
60 break;
61
62- bdp_t = bdp;
63- bdnum = 1;
64- index = fec_enet_get_bd_index(txq->tx_bd_base, bdp_t, fep);
65- skb = txq->tx_skbuff[index];
66- while (!skb) {
67- bdp_t = fec_enet_get_nextdesc(bdp_t, fep, queue_id);
68- index = fec_enet_get_bd_index(txq->tx_bd_base, bdp_t, fep);
69- skb = txq->tx_skbuff[index];
70- bdnum++;
71- }
72- if (skb_shinfo(skb)->nr_frags &&
73- (status = bdp_t->cbd_sc) & BD_ENET_TX_READY)
74- break;
75+ index = fec_enet_get_bd_index(txq->tx_bd_base, bdp, fep);
76
77- for (i = 0; i < bdnum; i++) {
78- if (!IS_TSO_HEADER(txq, bdp->cbd_bufaddr))
79- dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
80- bdp->cbd_datlen, DMA_TO_DEVICE);
81- bdp->cbd_bufaddr = 0;
82- if (i < bdnum - 1)
83- bdp = fec_enet_get_nextdesc(bdp, fep, queue_id);
84- }
85+ skb = txq->tx_skbuff[index];
86 txq->tx_skbuff[index] = NULL;
87+ if (!IS_TSO_HEADER(txq, bdp->cbd_bufaddr))
88+ dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
89+ bdp->cbd_datlen, DMA_TO_DEVICE);
90+ bdp->cbd_bufaddr = 0;
91+ if (!skb) {
92+ bdp = fec_enet_get_nextdesc(bdp, fep, queue_id);
93+ continue;
94+ }
95
96 /* Check for errors. */
97 if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
98--
991.9.3
100
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/mx6/defconfig
index eb0b6ae2..30aabbd3 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.14.28/mx6/defconfig
@@ -1,14 +1,14 @@
1CONFIG_LOCALVERSION="-1.0.0_ga"
1CONFIG_KERNEL_LZO=y 2CONFIG_KERNEL_LZO=y
2CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y 4CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y 5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=18 6CONFIG_LOG_BUF_SHIFT=18
8CONFIG_CGROUPS=y 7CONFIG_CGROUPS=y
9CONFIG_RELAY=y 8CONFIG_RELAY=y
10CONFIG_BLK_DEV_INITRD=y 9CONFIG_BLK_DEV_INITRD=y
11CONFIG_EXPERT=y 10CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y
12CONFIG_PERF_EVENTS=y 12CONFIG_PERF_EVENTS=y
13# CONFIG_SLUB_DEBUG is not set 13# CONFIG_SLUB_DEBUG is not set
14# CONFIG_COMPAT_BRK is not set 14# CONFIG_COMPAT_BRK is not set
@@ -19,9 +19,9 @@ CONFIG_MODULE_SRCVERSION_ALL=y
19# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_GPIO_PCA953X=y 20CONFIG_GPIO_PCA953X=y
21CONFIG_ARCH_MXC=y 21CONFIG_ARCH_MXC=y
22CONFIG_MXC_DEBUG_BOARD=y
23CONFIG_MACH_IMX51_DT=y 22CONFIG_MACH_IMX51_DT=y
24CONFIG_MACH_EUKREA_CPUIMX51SD=y 23CONFIG_MACH_EUKREA_CPUIMX51SD=y
24CONFIG_SOC_IMX50=y
25CONFIG_SOC_IMX53=y 25CONFIG_SOC_IMX53=y
26CONFIG_SOC_IMX6Q=y 26CONFIG_SOC_IMX6Q=y
27CONFIG_SOC_IMX6SL=y 27CONFIG_SOC_IMX6SL=y
@@ -32,12 +32,16 @@ CONFIG_SMP=y
32CONFIG_VMSPLIT_2G=y 32CONFIG_VMSPLIT_2G=y
33CONFIG_PREEMPT_RT_FULL=y 33CONFIG_PREEMPT_RT_FULL=y
34CONFIG_AEABI=y 34CONFIG_AEABI=y
35# CONFIG_OABI_COMPAT is not set
36CONFIG_HIGHMEM=y 35CONFIG_HIGHMEM=y
36CONFIG_CMA=y
37CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" 37CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
38CONFIG_CPU_FREQ=y 38CONFIG_CPU_FREQ=y
39# CONFIG_CPU_FREQ_STAT is not set 39CONFIG_CPU_FREQ_GOV_POWERSAVE=y
40CONFIG_ARM_IMX6_CPUFREQ=y 40CONFIG_CPU_FREQ_GOV_USERSPACE=y
41CONFIG_CPU_FREQ_GOV_ONDEMAND=y
42CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
43CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
44CONFIG_ARM_IMX6Q_CPUFREQ=y
41CONFIG_CPU_IDLE=y 45CONFIG_CPU_IDLE=y
42CONFIG_VFP=y 46CONFIG_VFP=y
43CONFIG_NEON=y 47CONFIG_NEON=y
@@ -62,13 +66,27 @@ CONFIG_LLC2=y
62CONFIG_CAN=y 66CONFIG_CAN=y
63CONFIG_CAN_FLEXCAN=y 67CONFIG_CAN_FLEXCAN=y
64CONFIG_CAN_M_CAN=y 68CONFIG_CAN_M_CAN=y
69CONFIG_BT=y
70CONFIG_BT_RFCOMM=y
71CONFIG_BT_RFCOMM_TTY=y
72CONFIG_BT_BNEP=y
73CONFIG_BT_BNEP_MC_FILTER=y
74CONFIG_BT_BNEP_PROTO_FILTER=y
75CONFIG_BT_HIDP=y
76CONFIG_BT_HCIBTUSB=y
77CONFIG_BT_HCIBTSDIO=y
78CONFIG_BT_HCIUART=y
79CONFIG_BT_HCIUART_H4=y
80CONFIG_BT_HCIUART_BCSP=y
81CONFIG_BT_HCIUART_ATH3K=y
82CONFIG_BT_HCIBCM203X=y
83CONFIG_BT_ATH3K=y
65CONFIG_CFG80211=y 84CONFIG_CFG80211=y
66CONFIG_CFG80211_WEXT=y
67CONFIG_MAC80211=y 85CONFIG_MAC80211=y
68CONFIG_DEVTMPFS=y 86CONFIG_DEVTMPFS=y
69CONFIG_DEVTMPFS_MOUNT=y 87CONFIG_DEVTMPFS_MOUNT=y
70# CONFIG_STANDALONE is not set 88# CONFIG_STANDALONE is not set
71CONFIG_CMA=y 89CONFIG_DMA_CMA=y
72CONFIG_CMA_SIZE_MBYTES=320 90CONFIG_CMA_SIZE_MBYTES=320
73CONFIG_IMX_WEIM=y 91CONFIG_IMX_WEIM=y
74CONFIG_CONNECTOR=y 92CONFIG_CONNECTOR=y
@@ -87,7 +105,7 @@ CONFIG_MTD_SST25L=y
87CONFIG_MTD_NAND=y 105CONFIG_MTD_NAND=y
88CONFIG_MTD_NAND_GPMI_NAND=y 106CONFIG_MTD_NAND_GPMI_NAND=y
89CONFIG_MTD_NAND_MXC=y 107CONFIG_MTD_NAND_MXC=y
90CONFIG_MTD_SPI_NOR_BASE=y 108CONFIG_MTD_SPI_NOR=y
91CONFIG_SPI_FSL_QUADSPI=y 109CONFIG_SPI_FSL_QUADSPI=y
92CONFIG_MTD_UBI=y 110CONFIG_MTD_UBI=y
93CONFIG_BLK_DEV_LOOP=y 111CONFIG_BLK_DEV_LOOP=y
@@ -121,9 +139,15 @@ CONFIG_SMC91X=y
121CONFIG_SMC911X=y 139CONFIG_SMC911X=y
122CONFIG_SMSC911X=y 140CONFIG_SMSC911X=y
123# CONFIG_NET_VENDOR_STMICRO is not set 141# CONFIG_NET_VENDOR_STMICRO is not set
142CONFIG_USB_PEGASUS=m
143CONFIG_USB_RTL8150=m
144CONFIG_USB_RTL8152=m
145CONFIG_USB_USBNET=m
146CONFIG_USB_NET_CDC_EEM=m
124CONFIG_ATH_CARDS=y 147CONFIG_ATH_CARDS=y
125CONFIG_ATH6KL=m 148CONFIG_ATH6KL=m
126CONFIG_ATH6KL_SDIO=m 149CONFIG_ATH6KL_SDIO=m
150CONFIG_BRCMFMAC=m
127# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 151# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
128CONFIG_INPUT_EVDEV=y 152CONFIG_INPUT_EVDEV=y
129CONFIG_INPUT_EVBUG=m 153CONFIG_INPUT_EVBUG=m
@@ -137,11 +161,12 @@ CONFIG_TOUCHSCREEN_EGALAX=y
137CONFIG_TOUCHSCREEN_ELAN=y 161CONFIG_TOUCHSCREEN_ELAN=y
138CONFIG_TOUCHSCREEN_MAX11801=y 162CONFIG_TOUCHSCREEN_MAX11801=y
139CONFIG_TOUCHSCREEN_MC13783=y 163CONFIG_TOUCHSCREEN_MC13783=y
164CONFIG_TOUCHSCREEN_TSC2007=y
165CONFIG_TOUCHSCREEN_STMPE=y
140CONFIG_INPUT_MISC=y 166CONFIG_INPUT_MISC=y
141CONFIG_INPUT_MMA8450=y 167CONFIG_INPUT_MMA8450=y
142CONFIG_INPUT_ISL29023=y 168CONFIG_INPUT_ISL29023=y
143CONFIG_SERIO_SERPORT=m 169CONFIG_SERIO_SERPORT=m
144CONFIG_VT_HW_CONSOLE_BINDING=y
145# CONFIG_LEGACY_PTYS is not set 170# CONFIG_LEGACY_PTYS is not set
146# CONFIG_DEVKMEM is not set 171# CONFIG_DEVKMEM is not set
147CONFIG_SERIAL_IMX=y 172CONFIG_SERIAL_IMX=y
@@ -149,7 +174,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
149CONFIG_SERIAL_FSL_LPUART=y 174CONFIG_SERIAL_FSL_LPUART=y
150CONFIG_SERIAL_FSL_LPUART_CONSOLE=y 175CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
151CONFIG_FSL_OTP=y 176CONFIG_FSL_OTP=y
152CONFIG_MXS_VIIM=y
153# CONFIG_I2C_COMPAT is not set 177# CONFIG_I2C_COMPAT is not set
154CONFIG_I2C_CHARDEV=y 178CONFIG_I2C_CHARDEV=y
155# CONFIG_I2C_HELPER_AUTO is not set 179# CONFIG_I2C_HELPER_AUTO is not set
@@ -159,10 +183,8 @@ CONFIG_I2C_IMX=y
159CONFIG_SPI=y 183CONFIG_SPI=y
160CONFIG_SPI_IMX=y 184CONFIG_SPI_IMX=y
161CONFIG_GPIO_SYSFS=y 185CONFIG_GPIO_SYSFS=y
162CONFIG_GPIO_MAX732X=y
163CONFIG_POWER_SUPPLY=y 186CONFIG_POWER_SUPPLY=y
164CONFIG_SABRESD_MAX8903=y 187CONFIG_SABRESD_MAX8903=y
165CONFIG_IMX6_USB_CHARGER=y
166CONFIG_SENSORS_MAX17135=y 188CONFIG_SENSORS_MAX17135=y
167CONFIG_SENSORS_MAG3110=y 189CONFIG_SENSORS_MAG3110=y
168CONFIG_THERMAL=y 190CONFIG_THERMAL=y
@@ -176,34 +198,39 @@ CONFIG_MFD_MC13XXX_SPI=y
176CONFIG_MFD_MC13XXX_I2C=y 198CONFIG_MFD_MC13XXX_I2C=y
177CONFIG_MFD_MAX17135=y 199CONFIG_MFD_MAX17135=y
178CONFIG_MFD_SI476X_CORE=y 200CONFIG_MFD_SI476X_CORE=y
201CONFIG_MFD_STMPE=y
179CONFIG_REGULATOR=y 202CONFIG_REGULATOR=y
180CONFIG_REGULATOR_FIXED_VOLTAGE=y 203CONFIG_REGULATOR_FIXED_VOLTAGE=y
181CONFIG_REGULATOR_DA9052=y
182CONFIG_REGULATOR_ANATOP=y 204CONFIG_REGULATOR_ANATOP=y
205CONFIG_REGULATOR_DA9052=y
206CONFIG_REGULATOR_MAX17135=y
183CONFIG_REGULATOR_MC13783=y 207CONFIG_REGULATOR_MC13783=y
184CONFIG_REGULATOR_MC13892=y 208CONFIG_REGULATOR_MC13892=y
185CONFIG_REGULATOR_MAX17135=y
186CONFIG_REGULATOR_PFUZE100=y 209CONFIG_REGULATOR_PFUZE100=y
187CONFIG_MEDIA_SUPPORT=y 210CONFIG_MEDIA_SUPPORT=y
188CONFIG_MEDIA_CAMERA_SUPPORT=y 211CONFIG_MEDIA_CAMERA_SUPPORT=y
189CONFIG_MEDIA_RADIO_SUPPORT=y 212CONFIG_MEDIA_RADIO_SUPPORT=y
190CONFIG_VIDEO_V4L2_INT_DEVICE=y 213CONFIG_MEDIA_RC_SUPPORT=y
214CONFIG_RC_DEVICES=y
215CONFIG_IR_GPIO_CIR=y
191CONFIG_MEDIA_USB_SUPPORT=y 216CONFIG_MEDIA_USB_SUPPORT=y
192CONFIG_USB_VIDEO_CLASS=m 217CONFIG_USB_VIDEO_CLASS=m
193CONFIG_V4L_PLATFORM_DRIVERS=y 218CONFIG_V4L_PLATFORM_DRIVERS=y
194CONFIG_VIDEO_MXC_OUTPUT=y 219CONFIG_VIDEO_MXC_OUTPUT=y
195CONFIG_VIDEO_MXC_CAPTURE=m 220CONFIG_VIDEO_MXC_CAPTURE=m
196CONFIG_VIDEO_MXC_CSI_CAMERA=m
197CONFIG_MXC_CAMERA_OV5640=m 221CONFIG_MXC_CAMERA_OV5640=m
198CONFIG_MXC_CAMERA_OV5642=m 222CONFIG_MXC_CAMERA_OV5642=m
199CONFIG_MXC_CAMERA_OV5640_MIPI=m 223CONFIG_MXC_CAMERA_OV5640_MIPI=m
200CONFIG_MXC_TVIN_ADV7180=m 224CONFIG_MXC_TVIN_ADV7180=m
201CONFIG_MXC_VADC=m
202CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m 225CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
203CONFIG_VIDEO_MXC_IPU_OUTPUT=y 226CONFIG_VIDEO_MXC_IPU_OUTPUT=y
204CONFIG_VIDEO_MXC_PXP_V4L2=y 227CONFIG_VIDEO_MXC_PXP_V4L2=y
228CONFIG_VIDEO_MXC_CSI_CAMERA=m
229CONFIG_MXC_VADC=m
205CONFIG_SOC_CAMERA=y 230CONFIG_SOC_CAMERA=y
206CONFIG_VIDEO_MX3=y 231CONFIG_VIDEO_MX3=y
232CONFIG_V4L_MEM2MEM_DRIVERS=y
233CONFIG_VIDEO_CODA=y
207CONFIG_RADIO_SI476X=y 234CONFIG_RADIO_SI476X=y
208CONFIG_SOC_CAMERA_OV2640=y 235CONFIG_SOC_CAMERA_OV2640=y
209CONFIG_DRM=y 236CONFIG_DRM=y
@@ -227,9 +254,6 @@ CONFIG_FB_MXC_DCIC=m
227CONFIG_HANNSTAR_CABC=y 254CONFIG_HANNSTAR_CABC=y
228CONFIG_FRAMEBUFFER_CONSOLE=y 255CONFIG_FRAMEBUFFER_CONSOLE=y
229CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 256CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
230CONFIG_FONTS=y
231CONFIG_FONT_8x8=y
232CONFIG_FONT_8x16=y
233CONFIG_LOGO=y 257CONFIG_LOGO=y
234CONFIG_SOUND=y 258CONFIG_SOUND=y
235CONFIG_SND=y 259CONFIG_SND=y
@@ -240,23 +264,43 @@ CONFIG_SND_SOC_EUKREA_TLV320=y
240CONFIG_SND_SOC_IMX_CS42888=y 264CONFIG_SND_SOC_IMX_CS42888=y
241CONFIG_SND_SOC_IMX_WM8962=y 265CONFIG_SND_SOC_IMX_WM8962=y
242CONFIG_SND_SOC_IMX_SGTL5000=y 266CONFIG_SND_SOC_IMX_SGTL5000=y
267CONFIG_SND_SOC_IMX_MQS=y
243CONFIG_SND_SOC_IMX_SPDIF=y 268CONFIG_SND_SOC_IMX_SPDIF=y
244CONFIG_SND_SOC_IMX_MC13783=y 269CONFIG_SND_SOC_IMX_MC13783=y
245CONFIG_SND_SOC_IMX_HDMI=y 270CONFIG_SND_SOC_IMX_HDMI=y
246CONFIG_SND_SOC_IMX_SI476X=y 271CONFIG_SND_SOC_IMX_SI476X=y
247CONFIG_SND_SOC_CS42XX8_I2C=y
248CONFIG_USB=y 272CONFIG_USB=y
249CONFIG_USB_EHCI_HCD=y 273CONFIG_USB_EHCI_HCD=y
274CONFIG_USB_EHCI_MXC=y
275CONFIG_USB_ACM=m
250CONFIG_USB_STORAGE=y 276CONFIG_USB_STORAGE=y
251CONFIG_USB_CHIPIDEA=y 277CONFIG_USB_CHIPIDEA=y
252CONFIG_USB_CHIPIDEA_UDC=y 278CONFIG_USB_CHIPIDEA_UDC=y
253CONFIG_USB_CHIPIDEA_HOST=y 279CONFIG_USB_CHIPIDEA_HOST=y
280CONFIG_USB_SERIAL=m
281CONFIG_USB_SERIAL_GENERIC=y
282CONFIG_USB_SERIAL_FTDI_SIO=m
283CONFIG_USB_SERIAL_OPTION=m
284CONFIG_USB_EHSET_TEST_FIXTURE=m
254CONFIG_NOP_USB_XCEIV=y 285CONFIG_NOP_USB_XCEIV=y
255CONFIG_USB_MXS_PHY=y 286CONFIG_USB_MXS_PHY=y
256CONFIG_USB_GADGET=y 287CONFIG_USB_GADGET=y
288CONFIG_USB_CONFIGFS=m
289CONFIG_USB_CONFIGFS_SERIAL=y
290CONFIG_USB_CONFIGFS_ACM=y
291CONFIG_USB_CONFIGFS_OBEX=y
292CONFIG_USB_CONFIGFS_NCM=y
293CONFIG_USB_CONFIGFS_ECM=y
294CONFIG_USB_CONFIGFS_ECM_SUBSET=y
295CONFIG_USB_CONFIGFS_RNDIS=y
296CONFIG_USB_CONFIGFS_EEM=y
297CONFIG_USB_CONFIGFS_MASS_STORAGE=y
298CONFIG_USB_CONFIGFS_F_LB_SS=y
299CONFIG_USB_CONFIGFS_F_FS=y
257CONFIG_USB_ZERO=m 300CONFIG_USB_ZERO=m
258CONFIG_USB_ETH=m 301CONFIG_USB_ETH=m
259CONFIG_USB_G_NCM=m 302CONFIG_USB_G_NCM=m
303CONFIG_USB_GADGETFS=m
260CONFIG_USB_MASS_STORAGE=m 304CONFIG_USB_MASS_STORAGE=m
261CONFIG_USB_G_SERIAL=m 305CONFIG_USB_G_SERIAL=m
262CONFIG_MMC=y 306CONFIG_MMC=y
@@ -266,13 +310,16 @@ CONFIG_MMC_SDHCI_PLTFM=y
266CONFIG_MMC_SDHCI_ESDHC_IMX=y 310CONFIG_MMC_SDHCI_ESDHC_IMX=y
267CONFIG_MXC_IPU=y 311CONFIG_MXC_IPU=y
268CONFIG_MXC_GPU_VIV=y 312CONFIG_MXC_GPU_VIV=y
269CONFIG_MXC_ASRC=y
270CONFIG_MXC_MIPI_CSI2=y 313CONFIG_MXC_MIPI_CSI2=y
271CONFIG_MXC_MLB150=m 314CONFIG_MXC_MLB150=m
272CONFIG_NEW_LEDS=y 315CONFIG_NEW_LEDS=y
273CONFIG_LEDS_CLASS=y 316CONFIG_LEDS_CLASS=y
274CONFIG_LEDS_GPIO=y 317CONFIG_LEDS_GPIO=y
275CONFIG_LEDS_TRIGGERS=y 318CONFIG_LEDS_TRIGGERS=y
319CONFIG_LEDS_TRIGGER_TIMER=y
320CONFIG_LEDS_TRIGGER_ONESHOT=y
321CONFIG_LEDS_TRIGGER_HEARTBEAT=y
322CONFIG_LEDS_TRIGGER_BACKLIGHT=y
276CONFIG_LEDS_TRIGGER_GPIO=y 323CONFIG_LEDS_TRIGGER_GPIO=y
277CONFIG_RTC_CLASS=y 324CONFIG_RTC_CLASS=y
278CONFIG_RTC_INTF_DEV_UIE_EMUL=y 325CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -284,7 +331,7 @@ CONFIG_MXC_PXP_V2=y
284CONFIG_IMX_SDMA=y 331CONFIG_IMX_SDMA=y
285CONFIG_MXS_DMA=y 332CONFIG_MXS_DMA=y
286CONFIG_STAGING=y 333CONFIG_STAGING=y
287CONFIG_COMMON_CLK_DEBUG=y 334CONFIG_STAGING_MEDIA=y
288# CONFIG_IOMMU_SUPPORT is not set 335# CONFIG_IOMMU_SUPPORT is not set
289CONFIG_IIO=y 336CONFIG_IIO=y
290CONFIG_VF610_ADC=y 337CONFIG_VF610_ADC=y
@@ -324,6 +371,7 @@ CONFIG_NLS_ASCII=y
324CONFIG_NLS_ISO8859_1=y 371CONFIG_NLS_ISO8859_1=y
325CONFIG_NLS_ISO8859_15=m 372CONFIG_NLS_ISO8859_15=m
326CONFIG_NLS_UTF8=y 373CONFIG_NLS_UTF8=y
374CONFIG_DEBUG_FS=y
327CONFIG_MAGIC_SYSRQ=y 375CONFIG_MAGIC_SYSRQ=y
328# CONFIG_SCHED_DEBUG is not set 376# CONFIG_SCHED_DEBUG is not set
329# CONFIG_DEBUG_BUGVERBOSE is not set 377# CONFIG_DEBUG_BUGVERBOSE is not set
@@ -331,11 +379,9 @@ CONFIG_MAGIC_SYSRQ=y
331CONFIG_SECURITYFS=y 379CONFIG_SECURITYFS=y
332CONFIG_CRYPTO_USER=y 380CONFIG_CRYPTO_USER=y
333CONFIG_CRYPTO_TEST=m 381CONFIG_CRYPTO_TEST=m
334CONFIG_CRYPTO_CCM=y
335CONFIG_CRYPTO_GCM=y 382CONFIG_CRYPTO_GCM=y
336CONFIG_CRYPTO_CBC=y 383CONFIG_CRYPTO_CBC=y
337CONFIG_CRYPTO_CTS=y 384CONFIG_CRYPTO_CTS=y
338CONFIG_CRYPTO_ECB=y
339CONFIG_CRYPTO_LRW=y 385CONFIG_CRYPTO_LRW=y
340CONFIG_CRYPTO_XTS=y 386CONFIG_CRYPTO_XTS=y
341CONFIG_CRYPTO_MD4=y 387CONFIG_CRYPTO_MD4=y
@@ -346,7 +392,6 @@ CONFIG_CRYPTO_RMD160=y
346CONFIG_CRYPTO_RMD256=y 392CONFIG_CRYPTO_RMD256=y
347CONFIG_CRYPTO_RMD320=y 393CONFIG_CRYPTO_RMD320=y
348CONFIG_CRYPTO_SHA1=y 394CONFIG_CRYPTO_SHA1=y
349CONFIG_CRYPTO_SHA256=y
350CONFIG_CRYPTO_SHA512=y 395CONFIG_CRYPTO_SHA512=y
351CONFIG_CRYPTO_TGR192=y 396CONFIG_CRYPTO_TGR192=y
352CONFIG_CRYPTO_WP512=y 397CONFIG_CRYPTO_WP512=y
@@ -363,3 +408,6 @@ CONFIG_CRC_CCITT=m
363CONFIG_CRC_T10DIF=y 408CONFIG_CRC_T10DIF=y
364CONFIG_CRC7=m 409CONFIG_CRC7=m
365CONFIG_LIBCRC32C=m 410CONFIG_LIBCRC32C=m
411CONFIG_FONTS=y
412CONFIG_FONT_8x8=y
413CONFIG_FONT_8x16=y
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.31.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.31.bb
deleted file mode 100644
index 7724b7b4..00000000
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.31.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1# Adapted from linux-imx_3.10.31.bb
2
3SUMMARY = "Linux real-time kernel based on linux-imx"
4DESCRIPTION = "Linux kernel that is based on Freescale's linux-imx, \
5with added real-time capabilities."
6
7require recipes-kernel/linux/linux-imx.inc
8require recipes-kernel/linux/linux-dtb.inc
9
10DEPENDS += "lzop-native bc-native"
11
12SRCBRANCH = "imx_3.10.31_1.1.0_beta2"
13SRCREV = "30ad12bdf93050a5bae1345bd40dba5f2d63f70f"
14LOCALVERSION = "-1.1.0_beta2"
15
16SRC_URI += "\
17 file://0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch \
18 https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/older/patch-3.10.27-rt25.patch.gz;name=rt-patch1 \
19 file://0001-fix-build.patch \
20 file://0002-fix-build-with-rt-enabled.patch \
21 file://0003-no-split-ptlocks.patch \
22"
23
24SRC_URI[rt-patch1.md5sum] = "aa231425f2a43220b5e8dbb057c7e5f9"
25SRC_URI[rt-patch1.sha256sum] = "5fbee5cdf260db9b7751651ab141fb59f46d68c7aecfc32e81a2b5d702f47aac"
26
27COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.14.28.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.14.28.bb
new file mode 100644
index 00000000..f5cb5806
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.14.28.bb
@@ -0,0 +1,31 @@
1# Adapted from linux-imx_3.14.28.bb
2
3SUMMARY = "Linux real-time kernel based on linux-imx"
4DESCRIPTION = "Linux kernel that is based on Freescale's linux-imx, \
5with added real-time capabilities."
6
7require recipes-kernel/linux/linux-imx.inc
8require recipes-kernel/linux/linux-dtb.inc
9
10DEPENDS += "lzop-native bc-native"
11
12SRCBRANCH = "imx_3.14.28_1.0.0_ga"
13SRCREV = "91cf351a2afc17ac4a260e4d2ad1e32d00925a1b"
14LOCALVERSION = "-1.0.0_ga"
15
16SRC_URI += "\
17 file://0001-ARM-imx6q-drop-unnecessary-semicolon.patch \
18 file://0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch \
19 file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \
20 file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \
21 file://0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch \
22 https://www.kernel.org/pub/linux/kernel/projects/rt/3.14/older/patch-3.14.28-rt25.patch.gz;name=rt-patch1 \
23 file://0001-fix-build.patch \
24 file://0002-fix-build-with-rt-enabled.patch \
25 file://0003-no-split-ptlocks.patch \
26"
27
28SRC_URI[rt-patch1.md5sum] = "28bfd1e14ccab1ea1fb48f56f982d80c"
29SRC_URI[rt-patch1.sha256sum] = "4c9bd426cf559a99e169208df5535fcb18ec98daec73f148c88859a7c3333e52"
30
31COMPATIBLE_MACHINE = "(mx6)"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-19 15:25:36 +0000