diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-07-11 14:59:53 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-07-13 14:13:29 -0300 |
commit | c3a6be93645711d4a60267c7911b8676ecbef6e3 (patch) | |
tree | 6a6d1edb40972d80f2fd47cdfb7b25b0c347e3b3 | |
parent | 63985dc4a6fdbbc2fe53b289a5484110ee6f1d81 (diff) | |
download | meta-freescale-c3a6be93645711d4a60267c7911b8676ecbef6e3.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/defconfig | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb | 2 |
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 | |||
27 | CONFIG_SOC_IMX6SX=y | 27 | CONFIG_SOC_IMX6SX=y |
28 | CONFIG_SOC_IMX6ULL=y | 28 | CONFIG_SOC_IMX6ULL=y |
29 | CONFIG_SOC_IMX7D=y | 29 | CONFIG_SOC_IMX7D=y |
30 | CONFIG_SOC_IMX6SLL=y | ||
30 | CONFIG_SOC_VF610=y | 31 | CONFIG_SOC_VF610=y |
31 | # CONFIG_SWP_EMULATE is not set | 32 | # CONFIG_SWP_EMULATE is not set |
32 | CONFIG_SMP=y | 33 | CONFIG_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 | |||
11 | PV .= "+git${SRCPV}" | 11 | PV .= "+git${SRCPV}" |
12 | 12 | ||
13 | SRCBRANCH = "4.1-2.0.x-imx" | 13 | SRCBRANCH = "4.1-2.0.x-imx" |
14 | SRCREV = "ee67fc7e072df596577e3a4e4fce7b51816d4b0a" | 14 | SRCREV = "300a7650298b3334f356f36d30431ff8b6281237" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "(mx6|mx7)" | 16 | COMPATIBLE_MACHINE = "(mx6|mx7)" |