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