summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig4
-rw-r--r--recipes-kernel/linux/linux-fslc_4.8.bb (renamed from recipes-kernel/linux/linux-fslc_4.6.bb)6
2 files changed, 6 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 21339ce2..3219480b 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -146,7 +146,7 @@ CONFIG_MICREL_PHY=y
146CONFIG_USB_PEGASUS=m 146CONFIG_USB_PEGASUS=m
147CONFIG_USB_RTL8150=m 147CONFIG_USB_RTL8150=m
148CONFIG_USB_RTL8152=m 148CONFIG_USB_RTL8152=m
149CONFIG_USB_USBNET=m 149CONFIG_USB_USBNET=y
150CONFIG_USB_NET_CDC_EEM=m 150CONFIG_USB_NET_CDC_EEM=m
151CONFIG_BRCMFMAC=m 151CONFIG_BRCMFMAC=m
152CONFIG_WL12XX=m 152CONFIG_WL12XX=m
@@ -161,6 +161,7 @@ CONFIG_KEYBOARD_IMX=y
161CONFIG_MOUSE_PS2=m 161CONFIG_MOUSE_PS2=m
162CONFIG_MOUSE_PS2_ELANTECH=y 162CONFIG_MOUSE_PS2_ELANTECH=y
163CONFIG_INPUT_TOUCHSCREEN=y 163CONFIG_INPUT_TOUCHSCREEN=y
164CONFIG_TOUCHSCREEN_ADS7846=y
164CONFIG_TOUCHSCREEN_EGALAX=y 165CONFIG_TOUCHSCREEN_EGALAX=y
165CONFIG_TOUCHSCREEN_IMX6UL_TSC=y 166CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
166CONFIG_TOUCHSCREEN_EDT_FT5X06=y 167CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -296,6 +297,7 @@ CONFIG_USB_ZERO=m
296CONFIG_USB_ETH=m 297CONFIG_USB_ETH=m
297CONFIG_USB_G_NCM=m 298CONFIG_USB_G_NCM=m
298CONFIG_USB_GADGETFS=m 299CONFIG_USB_GADGETFS=m
300CONFIG_USB_FUNCTIONFS=m
299CONFIG_USB_MASS_STORAGE=m 301CONFIG_USB_MASS_STORAGE=m
300CONFIG_USB_G_SERIAL=m 302CONFIG_USB_G_SERIAL=m
301CONFIG_MMC=y 303CONFIG_MMC=y
diff --git a/recipes-kernel/linux/linux-fslc_4.6.bb b/recipes-kernel/linux/linux-fslc_4.8.bb
index e59d0eb0..4605394b 100644
--- a/recipes-kernel/linux/linux-fslc_4.6.bb
+++ b/recipes-kernel/linux/linux-fslc_4.8.bb
@@ -9,9 +9,9 @@ upstreaming."
9 9
10include linux-fslc.inc 10include linux-fslc.inc
11 11
12PV = "4.6+git${SRCPV}" 12+PV = "4.8+git${SRCPV}"
13 13
14SRCBRANCH = "4.6.x" 14SRCBRANCH = "4.8.x+fslc"
15SRCREV = "9be3cdc189ab931653b5d6c515627e75a9654119" 15SRCREV = "a7fac751ddba9e30101093fef61f2682cce039de"
16 16
17COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" 17COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"