diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 12 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_3.19.bb (renamed from recipes-kernel/linux/linux-fslc_3.18.bb) | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 6790f1b..7c2075a 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y | |||
54 | CONFIG_VFP=y | 54 | CONFIG_VFP=y |
55 | CONFIG_NEON=y | 55 | CONFIG_NEON=y |
56 | CONFIG_BINFMT_MISC=m | 56 | CONFIG_BINFMT_MISC=m |
57 | CONFIG_PM_RUNTIME=y | 57 | CONFIG_PM=y |
58 | CONFIG_PM_DEBUG=y | 58 | CONFIG_PM_DEBUG=y |
59 | CONFIG_PM_TEST_SUSPEND=y | 59 | CONFIG_PM_TEST_SUSPEND=y |
60 | CONFIG_NET=y | 60 | CONFIG_NET=y |
@@ -163,7 +163,13 @@ CONFIG_SPI_IMX=y | |||
163 | CONFIG_GPIO_SYSFS=y | 163 | CONFIG_GPIO_SYSFS=y |
164 | CONFIG_GPIO_MC9S08DZ60=y | 164 | CONFIG_GPIO_MC9S08DZ60=y |
165 | CONFIG_GPIO_STMPE=y | 165 | CONFIG_GPIO_STMPE=y |
166 | # CONFIG_HWMON is not set | 166 | CONFIG_SENSORS_GPIO_FAN=y |
167 | CONFIG_THERMAL=y | ||
168 | CONFIG_CPU_THERMAL=y | ||
169 | CONFIG_IMX_THERMAL=y | ||
170 | CONFIG_POWER_SUPPLY=y | ||
171 | CONFIG_POWER_RESET=y | ||
172 | CONFIG_POWER_RESET_IMX=y | ||
167 | CONFIG_WATCHDOG=y | 173 | CONFIG_WATCHDOG=y |
168 | CONFIG_IMX2_WDT=y | 174 | CONFIG_IMX2_WDT=y |
169 | CONFIG_MFD_DA9052_I2C=y | 175 | CONFIG_MFD_DA9052_I2C=y |
@@ -211,6 +217,7 @@ CONFIG_SND_SOC_IMX_WM8962=y | |||
211 | CONFIG_SND_SOC_IMX_SGTL5000=y | 217 | CONFIG_SND_SOC_IMX_SGTL5000=y |
212 | CONFIG_SND_SOC_IMX_SPDIF=y | 218 | CONFIG_SND_SOC_IMX_SPDIF=y |
213 | CONFIG_SND_SOC_IMX_MC13783=y | 219 | CONFIG_SND_SOC_IMX_MC13783=y |
220 | CONFIG_SND_SOC_TLV320AIC3X=y | ||
214 | CONFIG_SND_SIMPLE_CARD=y | 221 | CONFIG_SND_SIMPLE_CARD=y |
215 | CONFIG_USB=y | 222 | CONFIG_USB=y |
216 | CONFIG_USB_EHCI_HCD=y | 223 | CONFIG_USB_EHCI_HCD=y |
@@ -239,6 +246,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y | |||
239 | CONFIG_LEDS_TRIGGER_GPIO=y | 246 | CONFIG_LEDS_TRIGGER_GPIO=y |
240 | CONFIG_RTC_CLASS=y | 247 | CONFIG_RTC_CLASS=y |
241 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 248 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
249 | CONFIG_RTC_DRV_DS1307=y | ||
242 | CONFIG_RTC_DRV_ISL1208=y | 250 | CONFIG_RTC_DRV_ISL1208=y |
243 | CONFIG_RTC_DRV_PCF8563=y | 251 | CONFIG_RTC_DRV_PCF8563=y |
244 | CONFIG_RTC_DRV_MC13XXX=y | 252 | CONFIG_RTC_DRV_MC13XXX=y |
diff --git a/recipes-kernel/linux/linux-fslc_3.18.bb b/recipes-kernel/linux/linux-fslc_3.19.bb index dc24631..e44acba 100644 --- a/recipes-kernel/linux/linux-fslc_3.18.bb +++ b/recipes-kernel/linux/linux-fslc_3.19.bb | |||
@@ -9,9 +9,9 @@ upstreaming." | |||
9 | 9 | ||
10 | include linux-fslc.inc | 10 | include linux-fslc.inc |
11 | 11 | ||
12 | PV = "3.18+git${SRCPV}" | 12 | PV = "3.19+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "patches-3.18" | 14 | SRCBRANCH = "patches-3.19" |
15 | SRCREV = "483412c9dfc95744f59bb1dd5cfe416872d9cb9f" | 15 | SRCREV = "5fdbf2af0ad0e2f86210f1e9bc61dcbccb79aa73" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |