summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-07-11 14:59:53 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-08-07 11:50:53 -0300
commitc5a83f84733f5937cb46723b066ce580ca19fe65 (patch)
tree3d0344d9e5c38f2bb1fde24c48d4d4238b3997b2
parentc78799dd1b80aeb40d827a6c61c5be66a0aeecdb (diff)
downloadmeta-freescale-c5a83f84733f5937cb46723b066ce580ca19fe65.tar.gz
linux-fslc-imx: Bump to 300a765 revision
This merges the 4.1.15 2.1.0 GA release as well as the 4.1.42 stable release. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/defconfig1
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig
index cf4ebeb0..061a1bde 100644
--- a/recipes-kernel/linux/linux-fslc-imx/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/defconfig
@@ -27,6 +27,7 @@ CONFIG_SOC_IMX6SL=y
27CONFIG_SOC_IMX6SX=y 27CONFIG_SOC_IMX6SX=y
28CONFIG_SOC_IMX6ULL=y 28CONFIG_SOC_IMX6ULL=y
29CONFIG_SOC_IMX7D=y 29CONFIG_SOC_IMX7D=y
30CONFIG_SOC_IMX6SLL=y
30CONFIG_SOC_VF610=y 31CONFIG_SOC_VF610=y
31# CONFIG_SWP_EMULATE is not set 32# CONFIG_SWP_EMULATE is not set
32CONFIG_SMP=y 33CONFIG_SMP=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
index 69d928b2..04886c2c 100644
--- a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
@@ -11,6 +11,6 @@ include linux-fslc.inc
11PV .= "+git${SRCPV}" 11PV .= "+git${SRCPV}"
12 12
13SRCBRANCH = "4.1-2.0.x-imx" 13SRCBRANCH = "4.1-2.0.x-imx"
14SRCREV = "ee67fc7e072df596577e3a4e4fce7b51816d4b0a" 14SRCREV = "300a7650298b3334f356f36d30431ff8b6281237"
15 15
16COMPATIBLE_MACHINE = "(mx6|mx7)" 16COMPATIBLE_MACHINE = "(mx6|mx7)"