summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig3
-rw-r--r--recipes-kernel/linux/linux-fslc_4.1.bb (renamed from recipes-kernel/linux/linux-fslc_4.0.bb)6
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index f6989fb..d615e3d 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -73,7 +73,7 @@ CONFIG_CAN=y
73CONFIG_CAN_FLEXCAN=y 73CONFIG_CAN_FLEXCAN=y
74CONFIG_BT=y 74CONFIG_BT=y
75CONFIG_BT_HCIUART=y 75CONFIG_BT_HCIUART=y
76CONFIG_BT_HCIUART_3WIRE=y 76CONFIG_BT_HCIUART_H4=y
77CONFIG_CFG80211=y 77CONFIG_CFG80211=y
78CONFIG_CFG80211_WEXT=y 78CONFIG_CFG80211_WEXT=y
79CONFIG_MAC80211=y 79CONFIG_MAC80211=y
@@ -173,6 +173,7 @@ CONFIG_SPI=y
173CONFIG_SPI_IMX=y 173CONFIG_SPI_IMX=y
174CONFIG_GPIO_SYSFS=y 174CONFIG_GPIO_SYSFS=y
175CONFIG_GPIO_MC9S08DZ60=y 175CONFIG_GPIO_MC9S08DZ60=y
176CONFIG_GPIO_PCA953X=y
176CONFIG_GPIO_STMPE=y 177CONFIG_GPIO_STMPE=y
177CONFIG_POWER_SUPPLY=y 178CONFIG_POWER_SUPPLY=y
178CONFIG_POWER_RESET=y 179CONFIG_POWER_RESET=y
diff --git a/recipes-kernel/linux/linux-fslc_4.0.bb b/recipes-kernel/linux/linux-fslc_4.1.bb
index 807dd0b..84edf11 100644
--- a/recipes-kernel/linux/linux-fslc_4.0.bb
+++ b/recipes-kernel/linux/linux-fslc_4.1.bb
@@ -9,9 +9,9 @@ upstreaming."
9 9
10include linux-fslc.inc 10include linux-fslc.inc
11 11
12PV = "4.0+git${SRCPV}" 12PV = "4.1+git${SRCPV}"
13 13
14SRCBRANCH = "patches-4.0" 14SRCBRANCH = "patches-4.1"
15SRCREV = "4eb30aed4b7a0089b217c1647bd81a83fd928bc9" 15SRCREV = "665a389b8e62c444969ac65e3e0eda5d8c13ea24"
16 16
17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" 17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"