diff options
8 files changed, 27 insertions, 182 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch b/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch deleted file mode 100644 index 8d431832..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 5332a5467624b01d0c166309cd1dceac5f7b9d96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Voytik <voytikd@gmail.com> | ||
3 | Date: Thu, 6 Nov 2014 22:46:20 +0400 | ||
4 | Subject: [PATCH 1/3] ARM: imx6q: drop unnecessary semicolon | ||
5 | |||
6 | commit d2a10a1727b3948019128e83162f22c65859f1fd upstream. | ||
7 | |||
8 | Drop unnecessary semicolon after closing curly bracket. | ||
9 | |||
10 | Signed-off-by: Dmitry Voytik <voytikd@gmail.com> | ||
11 | Signed-off-by: Shawn Guo <shawn.guo@linaro.org> | ||
12 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
13 | |||
14 | Upstream-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 | |||
20 | diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c | ||
21 | index 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 | -- | ||
34 | 2.1.4 | ||
35 | |||
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch b/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch deleted file mode 100644 index d7b852da..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 5b9eb0cdaefd7ac8e31c1e1812582e0169ba9722 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gary Bisson <bisson.gary@gmail.com> | ||
3 | Date: Wed, 3 Dec 2014 15:03:51 -0800 | ||
4 | Subject: [PATCH 2/3] ARM: clk-imx6q: fix video divider for rev T0 1.0 | ||
5 | |||
6 | commit 81ef447950bf0955aca46f4a7617d8ce435cf0ce upstream. | ||
7 | |||
8 | The post dividers do not work on i.MX6Q rev T0 1.0 so they must be fixed | ||
9 | to 1. As the table index was wrong, a divider a of 4 could still be | ||
10 | requested which implied the clock not to be set properly. This is the | ||
11 | root cause of the HDMI not working at high resolution on rev T0 1.0 of | ||
12 | the SoC. | ||
13 | |||
14 | Signed-off-by: Gary Bisson <bisson.gary@gmail.com> | ||
15 | Cc: <stable@vger.kernel.org> | ||
16 | Signed-off-by: Shawn Guo <shawn.guo@linaro.org> | ||
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
18 | |||
19 | Upstream-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 | |||
25 | diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c | ||
26 | index 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 | -- | ||
39 | 2.1.4 | ||
40 | |||
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch b/recipes-kernel/linux/linux-imx-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch deleted file mode 100644 index d40e55af..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.28/0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | From a2fe37b69d4fe369c284d50927193fed81c238a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Estevam <fabio.estevam@freescale.com> | ||
3 | Date: Fri, 13 Mar 2015 14:07:54 -0300 | ||
4 | Subject: [PATCH] Revert "net: fec: fix the warning found by dma debug" | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This reverts commit 2b995f63987013bacde99168218f9c7b252bdcf1. | ||
10 | |||
11 | Панов Андрей reported the following regression: | ||
12 | |||
13 | "Commit 2b995f63987013bacde99168218f9c7b252bdcf1 in 4.0.0-rc3 introduces a | ||
14 | nasty bug in transmit, corrupting packets. | ||
15 | |||
16 | To reproduce: | ||
17 | |||
18 | $ dd if=/dev/zero of=zeros bs=1M count=20 | ||
19 | $ md5sum -b zeros | ||
20 | 8f4e33f3dc3e414ff94e5fb6905cba8c *zeros | ||
21 | |||
22 | This checksum is correct. | ||
23 | |||
24 | Copy file "zeros" to another host with NFS, and it gets corrupted, checksum is | ||
25 | changed. | ||
26 | File should be big, small amounts of transmit isn't affected. | ||
27 | |||
28 | I use an i.MX6 Quad board. | ||
29 | |||
30 | If this commit is reverted, all works fine." | ||
31 | |||
32 | Reported-by: Панов Андрей <rockford@yandex.ru> | ||
33 | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> | ||
34 | Signed-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 | |||
39 | diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c | ||
40 | index 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 | -- | ||
99 | 1.9.3 | ||
100 | |||
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch index 0743099f..0743099f 100644 --- a/recipes-kernel/linux/linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch +++ b/recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch | |||
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch b/recipes-kernel/linux/linux-imx-3.14.38/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch index 0d3caa40..0d3caa40 100644 --- a/recipes-kernel/linux/linux-imx-3.14.28/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch +++ b/recipes-kernel/linux/linux-imx-3.14.38/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch | |||
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/mx6/defconfig b/recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig index 303e6791..43f152fc 100644 --- a/recipes-kernel/linux/linux-imx-3.14.28/mx6/defconfig +++ b/recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig | |||
@@ -2,6 +2,8 @@ CONFIG_KERNEL_LZO=y | |||
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_NO_HZ=y | 3 | CONFIG_NO_HZ=y |
4 | CONFIG_HIGH_RES_TIMERS=y | 4 | CONFIG_HIGH_RES_TIMERS=y |
5 | CONFIG_IKCONFIG=y | ||
6 | CONFIG_IKCONFIG_PROC=y | ||
5 | CONFIG_LOG_BUF_SHIFT=18 | 7 | CONFIG_LOG_BUF_SHIFT=18 |
6 | CONFIG_CGROUPS=y | 8 | CONFIG_CGROUPS=y |
7 | CONFIG_RELAY=y | 9 | CONFIG_RELAY=y |
@@ -25,9 +27,11 @@ CONFIG_SOC_IMX53=y | |||
25 | CONFIG_SOC_IMX6Q=y | 27 | CONFIG_SOC_IMX6Q=y |
26 | CONFIG_SOC_IMX6SL=y | 28 | CONFIG_SOC_IMX6SL=y |
27 | CONFIG_SOC_IMX6SX=y | 29 | CONFIG_SOC_IMX6SX=y |
30 | CONFIG_SOC_IMX7D=y | ||
28 | CONFIG_SOC_VF610=y | 31 | CONFIG_SOC_VF610=y |
29 | # CONFIG_SWP_EMULATE is not set | 32 | # CONFIG_SWP_EMULATE is not set |
30 | CONFIG_SMP=y | 33 | CONFIG_SMP=y |
34 | CONFIG_HAVE_ARM_ARCH_TIMER=y | ||
31 | CONFIG_VMSPLIT_2G=y | 35 | CONFIG_VMSPLIT_2G=y |
32 | CONFIG_PREEMPT=y | 36 | CONFIG_PREEMPT=y |
33 | CONFIG_AEABI=y | 37 | CONFIG_AEABI=y |
@@ -42,6 +46,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y | |||
42 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 46 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
43 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 47 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
44 | CONFIG_ARM_IMX6Q_CPUFREQ=y | 48 | CONFIG_ARM_IMX6Q_CPUFREQ=y |
49 | CONFIG_ARM_IMX7D_CPUFREQ=y | ||
45 | CONFIG_CPU_IDLE=y | 50 | CONFIG_CPU_IDLE=y |
46 | CONFIG_VFP=y | 51 | CONFIG_VFP=y |
47 | CONFIG_NEON=y | 52 | CONFIG_NEON=y |
@@ -181,10 +186,14 @@ CONFIG_I2C_ALGOPCF=m | |||
181 | CONFIG_I2C_ALGOPCA=m | 186 | CONFIG_I2C_ALGOPCA=m |
182 | CONFIG_I2C_IMX=y | 187 | CONFIG_I2C_IMX=y |
183 | CONFIG_SPI=y | 188 | CONFIG_SPI=y |
189 | CONFIG_SPI_GPIO=y | ||
184 | CONFIG_SPI_IMX=y | 190 | CONFIG_SPI_IMX=y |
185 | CONFIG_GPIO_SYSFS=y | 191 | CONFIG_GPIO_SYSFS=y |
192 | CONFIG_GPIO_MAX732X=y | ||
193 | CONFIG_GPIO_74X164=y | ||
186 | CONFIG_POWER_SUPPLY=y | 194 | CONFIG_POWER_SUPPLY=y |
187 | CONFIG_SABRESD_MAX8903=y | 195 | CONFIG_SABRESD_MAX8903=y |
196 | CONFIG_IMX6_USB_CHARGER=y | ||
188 | CONFIG_SENSORS_MAX17135=y | 197 | CONFIG_SENSORS_MAX17135=y |
189 | CONFIG_SENSORS_MAG3110=y | 198 | CONFIG_SENSORS_MAG3110=y |
190 | CONFIG_THERMAL=y | 199 | CONFIG_THERMAL=y |
@@ -249,6 +258,7 @@ CONFIG_FB_MXC_MIPI_DSI=y | |||
249 | CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y | 258 | CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y |
250 | CONFIG_FB_MXC_HDMI=y | 259 | CONFIG_FB_MXC_HDMI=y |
251 | CONFIG_FB_MXC_EINK_PANEL=y | 260 | CONFIG_FB_MXC_EINK_PANEL=y |
261 | CONFIG_FB_MXC_EINK_V2_PANEL=y | ||
252 | CONFIG_FB_MXS_SII902X=y | 262 | CONFIG_FB_MXS_SII902X=y |
253 | CONFIG_FB_MXC_DCIC=m | 263 | CONFIG_FB_MXC_DCIC=m |
254 | CONFIG_HANNSTAR_CABC=y | 264 | CONFIG_HANNSTAR_CABC=y |
@@ -262,6 +272,9 @@ CONFIG_SND_SOC=y | |||
262 | CONFIG_SND_IMX_SOC=y | 272 | CONFIG_SND_IMX_SOC=y |
263 | CONFIG_SND_SOC_EUKREA_TLV320=y | 273 | CONFIG_SND_SOC_EUKREA_TLV320=y |
264 | CONFIG_SND_SOC_IMX_CS42888=y | 274 | CONFIG_SND_SOC_IMX_CS42888=y |
275 | CONFIG_SND_SOC_IMX_SII902X=y | ||
276 | CONFIG_SND_SOC_IMX_WM8958=y | ||
277 | CONFIG_SND_SOC_IMX_WM8960=y | ||
265 | CONFIG_SND_SOC_IMX_WM8962=y | 278 | CONFIG_SND_SOC_IMX_WM8962=y |
266 | CONFIG_SND_SOC_IMX_SGTL5000=y | 279 | CONFIG_SND_SOC_IMX_SGTL5000=y |
267 | CONFIG_SND_SOC_IMX_MQS=y | 280 | CONFIG_SND_SOC_IMX_MQS=y |
@@ -270,6 +283,7 @@ CONFIG_SND_SOC_IMX_MC13783=y | |||
270 | CONFIG_SND_SOC_IMX_HDMI=y | 283 | CONFIG_SND_SOC_IMX_HDMI=y |
271 | CONFIG_SND_SOC_IMX_SI476X=y | 284 | CONFIG_SND_SOC_IMX_SI476X=y |
272 | CONFIG_USB=y | 285 | CONFIG_USB=y |
286 | CONFIG_USB_OTG_FSM=y | ||
273 | CONFIG_USB_EHCI_HCD=y | 287 | CONFIG_USB_EHCI_HCD=y |
274 | CONFIG_USB_EHCI_MXC=y | 288 | CONFIG_USB_EHCI_MXC=y |
275 | CONFIG_USB_ACM=m | 289 | CONFIG_USB_ACM=m |
@@ -310,8 +324,10 @@ CONFIG_MMC_SDHCI_PLTFM=y | |||
310 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 324 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
311 | CONFIG_MXC_IPU=y | 325 | CONFIG_MXC_IPU=y |
312 | CONFIG_MXC_GPU_VIV=y | 326 | CONFIG_MXC_GPU_VIV=y |
327 | CONFIG_MXC_IPU_V3_PRE=y | ||
313 | CONFIG_MXC_MIPI_CSI2=y | 328 | CONFIG_MXC_MIPI_CSI2=y |
314 | CONFIG_MXC_MLB150=m | 329 | CONFIG_MXC_MLB150=m |
330 | CONFIG_MXC_SIM=y | ||
315 | CONFIG_NEW_LEDS=y | 331 | CONFIG_NEW_LEDS=y |
316 | CONFIG_LEDS_CLASS=y | 332 | CONFIG_LEDS_CLASS=y |
317 | CONFIG_LEDS_GPIO=y | 333 | CONFIG_LEDS_GPIO=y |
@@ -328,6 +344,7 @@ CONFIG_RTC_DRV_MXC=y | |||
328 | CONFIG_RTC_DRV_SNVS=y | 344 | CONFIG_RTC_DRV_SNVS=y |
329 | CONFIG_DMADEVICES=y | 345 | CONFIG_DMADEVICES=y |
330 | CONFIG_MXC_PXP_V2=y | 346 | CONFIG_MXC_PXP_V2=y |
347 | CONFIG_MXC_PXP_V3=y | ||
331 | CONFIG_IMX_SDMA=y | 348 | CONFIG_IMX_SDMA=y |
332 | CONFIG_MXS_DMA=y | 349 | CONFIG_MXS_DMA=y |
333 | CONFIG_STAGING=y | 350 | CONFIG_STAGING=y |
@@ -335,6 +352,7 @@ CONFIG_STAGING_MEDIA=y | |||
335 | # CONFIG_IOMMU_SUPPORT is not set | 352 | # CONFIG_IOMMU_SUPPORT is not set |
336 | CONFIG_IIO=y | 353 | CONFIG_IIO=y |
337 | CONFIG_VF610_ADC=y | 354 | CONFIG_VF610_ADC=y |
355 | CONFIG_AD2802A=y | ||
338 | CONFIG_PWM=y | 356 | CONFIG_PWM=y |
339 | CONFIG_PWM_IMX=y | 357 | CONFIG_PWM_IMX=y |
340 | CONFIG_EXT2_FS=y | 358 | CONFIG_EXT2_FS=y |
@@ -376,6 +394,11 @@ CONFIG_MAGIC_SYSRQ=y | |||
376 | # CONFIG_SCHED_DEBUG is not set | 394 | # CONFIG_SCHED_DEBUG is not set |
377 | # CONFIG_DEBUG_BUGVERBOSE is not set | 395 | # CONFIG_DEBUG_BUGVERBOSE is not set |
378 | # CONFIG_FTRACE is not set | 396 | # CONFIG_FTRACE is not set |
397 | CONFIG_CORESIGHT=y | ||
398 | CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y | ||
399 | CONFIG_CORESIGHT_SINK_TPIU=y | ||
400 | CONFIG_CORESIGHT_SINK_ETBV10=y | ||
401 | CONFIG_CORESIGHT_SOURCE_ETM3X=y | ||
379 | CONFIG_SECURITYFS=y | 402 | CONFIG_SECURITYFS=y |
380 | CONFIG_CRYPTO_USER=y | 403 | CONFIG_CRYPTO_USER=y |
381 | CONFIG_CRYPTO_TEST=m | 404 | CONFIG_CRYPTO_TEST=m |
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.14.28.bb b/recipes-kernel/linux/linux-imx-mfgtool_3.14.38.bb index 825c94a6..825c94a6 100644 --- a/recipes-kernel/linux/linux-imx-mfgtool_3.14.28.bb +++ b/recipes-kernel/linux/linux-imx-mfgtool_3.14.38.bb | |||
diff --git a/recipes-kernel/linux/linux-imx_3.14.28.bb b/recipes-kernel/linux/linux-imx_3.14.38.bb index ba6f99af..58661eb1 100644 --- a/recipes-kernel/linux/linux-imx_3.14.28.bb +++ b/recipes-kernel/linux/linux-imx_3.14.38.bb | |||
@@ -10,16 +10,13 @@ require recipes-kernel/linux/linux-dtb.inc | |||
10 | 10 | ||
11 | DEPENDS += "lzop-native bc-native" | 11 | DEPENDS += "lzop-native bc-native" |
12 | 12 | ||
13 | SRCBRANCH = "imx_3.14.28_1.0.0_ga" | 13 | SRCBRANCH = "imx_3.14.38_6qp_beta" |
14 | LOCALVERSION = "-1.0.0_ga" | 14 | LOCALVERSION = "-6QP_beta" |
15 | SRCREV = "91cf351a2afc17ac4a260e4d2ad1e32d00925a1b" | 15 | SRCREV = "a4dec7730c98f2639fe250a1a67f782b6f73bdf5" |
16 | 16 | ||
17 | SRC_URI += " \ | 17 | SRC_URI += " \ |
18 | file://0001-ARM-imx6q-drop-unnecessary-semicolon.patch \ | ||
19 | file://0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch \ | ||
20 | file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \ | 18 | file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \ |
21 | file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \ | 19 | file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \ |
22 | file://0005-Revert-net-fec-fix-the-warning-found-by-dma-debug.patch \ | ||
23 | " | 20 | " |
24 | 21 | ||
25 | COMPATIBLE_MACHINE = "(mx6)" | 22 | COMPATIBLE_MACHINE = "(mx6|mx7)" |