diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-11-10 11:16:17 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:22 -0300 |
commit | 84678c9b854678ecc6ecfce9a3dd35315b5c631d (patch) | |
tree | 7ce952e305c187e6a1b369270bdd8c2602f12717 /recipes-kernel/linux/linux-fslc/defconfig | |
parent | 719d099626e7c4ee3f1baa150cc4b1ecc559fa42 (diff) | |
download | meta-freescale-84678c9b854678ecc6ecfce9a3dd35315b5c631d.tar.gz |
Revert "linux-fslc: Upgrade to 4.3-based kernel"
This reverts commit 649f479f118567d62a5a57d690fb3fe3915f0ea7.
The 4.3 version of kernel cause build errors on lttng and cannot be
included until those are fix. We are reverting it now and will add it
back once OE-Core is fixed to support it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/linux-fslc/defconfig')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 79194c60..d615e3d3 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -3,8 +3,6 @@ CONFIG_SYSVIPC=y | |||
3 | CONFIG_FHANDLE=y | 3 | CONFIG_FHANDLE=y |
4 | CONFIG_NO_HZ=y | 4 | CONFIG_NO_HZ=y |
5 | CONFIG_HIGH_RES_TIMERS=y | 5 | CONFIG_HIGH_RES_TIMERS=y |
6 | CONFIG_IKCONFIG=y | ||
7 | CONFIG_IKCONFIG_PROC=y | ||
8 | CONFIG_LOG_BUF_SHIFT=18 | 6 | CONFIG_LOG_BUF_SHIFT=18 |
9 | CONFIG_CGROUPS=y | 7 | CONFIG_CGROUPS=y |
10 | CONFIG_RELAY=y | 8 | CONFIG_RELAY=y |
@@ -40,12 +38,10 @@ CONFIG_SOC_IMX53=y | |||
40 | CONFIG_SOC_IMX6Q=y | 38 | CONFIG_SOC_IMX6Q=y |
41 | CONFIG_SOC_IMX6SL=y | 39 | CONFIG_SOC_IMX6SL=y |
42 | CONFIG_SOC_IMX6SX=y | 40 | CONFIG_SOC_IMX6SX=y |
43 | CONFIG_SOC_IMX6UL=y | ||
44 | CONFIG_SOC_IMX7D=y | ||
45 | CONFIG_SOC_LS1021A=y | ||
46 | CONFIG_SOC_VF610=y | 41 | CONFIG_SOC_VF610=y |
47 | CONFIG_PCI=y | 42 | CONFIG_PCI=y |
48 | CONFIG_PCI_IMX6=y | 43 | CONFIG_PCI_IMX6=y |
44 | CONFIG_PCCARD=y | ||
49 | CONFIG_SMP=y | 45 | CONFIG_SMP=y |
50 | CONFIG_VMSPLIT_2G=y | 46 | CONFIG_VMSPLIT_2G=y |
51 | CONFIG_PREEMPT_VOLUNTARY=y | 47 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -53,7 +49,6 @@ CONFIG_AEABI=y | |||
53 | CONFIG_HIGHMEM=y | 49 | CONFIG_HIGHMEM=y |
54 | CONFIG_CMA=y | 50 | CONFIG_CMA=y |
55 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" | 51 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" |
56 | CONFIG_KEXEC=y | ||
57 | CONFIG_CPU_FREQ=y | 52 | CONFIG_CPU_FREQ=y |
58 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 53 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
59 | CONFIG_ARM_IMX6Q_CPUFREQ=y | 54 | CONFIG_ARM_IMX6Q_CPUFREQ=y |
@@ -79,8 +74,8 @@ CONFIG_CAN_FLEXCAN=y | |||
79 | CONFIG_BT=y | 74 | CONFIG_BT=y |
80 | CONFIG_BT_HCIUART=y | 75 | CONFIG_BT_HCIUART=y |
81 | CONFIG_BT_HCIUART_H4=y | 76 | CONFIG_BT_HCIUART_H4=y |
82 | CONFIG_BT_HCIUART_LL=y | ||
83 | CONFIG_CFG80211=y | 77 | CONFIG_CFG80211=y |
78 | CONFIG_CFG80211_WEXT=y | ||
84 | CONFIG_MAC80211=y | 79 | CONFIG_MAC80211=y |
85 | CONFIG_RFKILL=y | 80 | CONFIG_RFKILL=y |
86 | CONFIG_RFKILL_INPUT=y | 81 | CONFIG_RFKILL_INPUT=y |
@@ -144,16 +139,12 @@ CONFIG_USB_RTL8150=m | |||
144 | CONFIG_USB_RTL8152=m | 139 | CONFIG_USB_RTL8152=m |
145 | CONFIG_USB_USBNET=m | 140 | CONFIG_USB_USBNET=m |
146 | CONFIG_USB_NET_CDC_EEM=m | 141 | CONFIG_USB_NET_CDC_EEM=m |
147 | CONFIG_BRCMFMAC=m | 142 | CONFIG_PCMCIA_RAYCS=y |
148 | CONFIG_WL_TI=y | 143 | CONFIG_BRCMFMAC=y |
149 | CONFIG_WL12XX=m | ||
150 | CONFIG_WLCORE_SDIO=m | ||
151 | # CONFIG_WILINK_PLATFORM_DATA is not set | ||
152 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 144 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
153 | CONFIG_INPUT_EVDEV=y | 145 | CONFIG_INPUT_EVDEV=y |
154 | CONFIG_INPUT_EVBUG=m | 146 | CONFIG_INPUT_EVBUG=m |
155 | CONFIG_KEYBOARD_GPIO=y | 147 | CONFIG_KEYBOARD_GPIO=y |
156 | CONFIG_KEYBOARD_SNVS_PWRKEY=y | ||
157 | CONFIG_KEYBOARD_IMX=y | 148 | CONFIG_KEYBOARD_IMX=y |
158 | CONFIG_MOUSE_PS2=m | 149 | CONFIG_MOUSE_PS2=m |
159 | CONFIG_MOUSE_PS2_ELANTECH=y | 150 | CONFIG_MOUSE_PS2_ELANTECH=y |
@@ -162,7 +153,6 @@ CONFIG_TOUCHSCREEN_EGALAX=y | |||
162 | CONFIG_TOUCHSCREEN_MC13783=y | 153 | CONFIG_TOUCHSCREEN_MC13783=y |
163 | CONFIG_TOUCHSCREEN_TSC2007=y | 154 | CONFIG_TOUCHSCREEN_TSC2007=y |
164 | CONFIG_TOUCHSCREEN_STMPE=y | 155 | CONFIG_TOUCHSCREEN_STMPE=y |
165 | CONFIG_TOUCHSCREEN_SX8654=y | ||
166 | CONFIG_INPUT_MISC=y | 156 | CONFIG_INPUT_MISC=y |
167 | CONFIG_INPUT_MMA8450=y | 157 | CONFIG_INPUT_MMA8450=y |
168 | CONFIG_SERIO_SERPORT=m | 158 | CONFIG_SERIO_SERPORT=m |
@@ -189,7 +179,6 @@ CONFIG_POWER_SUPPLY=y | |||
189 | CONFIG_POWER_RESET=y | 179 | CONFIG_POWER_RESET=y |
190 | CONFIG_POWER_RESET_IMX=y | 180 | CONFIG_POWER_RESET_IMX=y |
191 | CONFIG_POWER_RESET_SYSCON=y | 181 | CONFIG_POWER_RESET_SYSCON=y |
192 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | ||
193 | CONFIG_SENSORS_GPIO_FAN=y | 182 | CONFIG_SENSORS_GPIO_FAN=y |
194 | CONFIG_THERMAL=y | 183 | CONFIG_THERMAL=y |
195 | CONFIG_CPU_THERMAL=y | 184 | CONFIG_CPU_THERMAL=y |
@@ -242,7 +231,7 @@ CONFIG_SOUND=y | |||
242 | CONFIG_SND=y | 231 | CONFIG_SND=y |
243 | CONFIG_SND_USB_AUDIO=m | 232 | CONFIG_SND_USB_AUDIO=m |
244 | CONFIG_SND_SOC=y | 233 | CONFIG_SND_SOC=y |
245 | CONFIG_SND_SOC_FSL_ASRC=y | 234 | CONFIG_SND_SOC_FSL_SAI=y |
246 | CONFIG_SND_IMX_SOC=y | 235 | CONFIG_SND_IMX_SOC=y |
247 | CONFIG_SND_SOC_PHYCORE_AC97=y | 236 | CONFIG_SND_SOC_PHYCORE_AC97=y |
248 | CONFIG_SND_SOC_EUKREA_TLV320=y | 237 | CONFIG_SND_SOC_EUKREA_TLV320=y |
@@ -250,8 +239,6 @@ CONFIG_SND_SOC_IMX_WM8962=y | |||
250 | CONFIG_SND_SOC_IMX_SGTL5000=y | 239 | CONFIG_SND_SOC_IMX_SGTL5000=y |
251 | CONFIG_SND_SOC_IMX_SPDIF=y | 240 | CONFIG_SND_SOC_IMX_SPDIF=y |
252 | CONFIG_SND_SOC_IMX_MC13783=y | 241 | CONFIG_SND_SOC_IMX_MC13783=y |
253 | CONFIG_SND_SOC_FSL_ASOC_CARD=y | ||
254 | CONFIG_SND_SOC_CS42XX8_I2C=y | ||
255 | CONFIG_SND_SOC_TLV320AIC3X=y | 242 | CONFIG_SND_SOC_TLV320AIC3X=y |
256 | CONFIG_SND_SIMPLE_CARD=y | 243 | CONFIG_SND_SIMPLE_CARD=y |
257 | CONFIG_USB=y | 244 | CONFIG_USB=y |
@@ -304,7 +291,6 @@ CONFIG_RTC_CLASS=y | |||
304 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 291 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
305 | CONFIG_RTC_DRV_DS1307=y | 292 | CONFIG_RTC_DRV_DS1307=y |
306 | CONFIG_RTC_DRV_ISL1208=y | 293 | CONFIG_RTC_DRV_ISL1208=y |
307 | CONFIG_RTC_DRV_PCF8523=y | ||
308 | CONFIG_RTC_DRV_PCF8563=y | 294 | CONFIG_RTC_DRV_PCF8563=y |
309 | CONFIG_RTC_DRV_MC13XXX=y | 295 | CONFIG_RTC_DRV_MC13XXX=y |
310 | CONFIG_RTC_DRV_MXC=y | 296 | CONFIG_RTC_DRV_MXC=y |
@@ -360,7 +346,8 @@ CONFIG_PROVE_LOCKING=y | |||
360 | # CONFIG_FTRACE is not set | 346 | # CONFIG_FTRACE is not set |
361 | # CONFIG_ARM_UNWIND is not set | 347 | # CONFIG_ARM_UNWIND is not set |
362 | CONFIG_SECURITYFS=y | 348 | CONFIG_SECURITYFS=y |
363 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | 349 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
350 | # CONFIG_CRYPTO_HW is not set | ||
364 | CONFIG_CRC_CCITT=m | 351 | CONFIG_CRC_CCITT=m |
365 | CONFIG_CRC_T10DIF=y | 352 | CONFIG_CRC_T10DIF=y |
366 | CONFIG_CRC7=m | 353 | CONFIG_CRC7=m |