summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-10-17 22:05:25 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-10-18 00:01:38 -0300
commit550a63b89e39e6f54699e030fe455482ecf96c06 (patch)
treeeaab0b65637c93d9d767a88af6e58f5bf00c5bfc
parent0b0dfeb4af89b1efa9f95cb23b53fe264cad7c1a (diff)
downloadmeta-fsl-arm-550a63b89e39e6f54699e030fe455482ecf96c06.tar.gz
linux-fslc: Update to 3.12-rc5 based release
This updates to 3.12-rc5 kernel. Following patches are still pending: 83cc074 iio: mxs-lradc: Fix the order of resources removal bc59b31 iio: mxs-lradc: Add MODULE_ALIAS 569cd56 ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle 0e35b56 ARM: dts: imx28-evk: Enable touchscreen support Change-Id: I335d7ee2016e72b694cf66d0bdb2f86d92d5e374 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig47
-rw-r--r--recipes-kernel/linux/linux-fslc/mxs/defconfig14
-rw-r--r--recipes-kernel/linux/linux-fslc_3.12.bb (renamed from recipes-kernel/linux/linux-fslc_3.11.bb)6
3 files changed, 38 insertions, 29 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index d279702..a39f466 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -17,10 +17,8 @@ CONFIG_MODULE_UNLOAD=y
17CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
18CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
19# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_ARCH_MXC=y
21CONFIG_ARCH_MULTI_V6=y 20CONFIG_ARCH_MULTI_V6=y
22CONFIG_ARCH_MULTI_V7=y 21CONFIG_ARCH_MXC=y
23CONFIG_MACH_IMX31_DT=y
24CONFIG_MACH_MX31LILLY=y 22CONFIG_MACH_MX31LILLY=y
25CONFIG_MACH_MX31LITE=y 23CONFIG_MACH_MX31LITE=y
26CONFIG_MACH_PCM037=y 24CONFIG_MACH_PCM037=y
@@ -30,6 +28,7 @@ CONFIG_MACH_MX31MOBOARD=y
30CONFIG_MACH_QONG=y 28CONFIG_MACH_QONG=y
31CONFIG_MACH_ARMADILLO5X0=y 29CONFIG_MACH_ARMADILLO5X0=y
32CONFIG_MACH_KZM_ARM11_01=y 30CONFIG_MACH_KZM_ARM11_01=y
31CONFIG_MACH_IMX31_DT=y
33CONFIG_MACH_PCM043=y 32CONFIG_MACH_PCM043=y
34CONFIG_MACH_MX35_3DS=y 33CONFIG_MACH_MX35_3DS=y
35CONFIG_MACH_VPR200=y 34CONFIG_MACH_VPR200=y
@@ -64,20 +63,24 @@ CONFIG_IP_PNP_DHCP=y
64# CONFIG_INET_LRO is not set 63# CONFIG_INET_LRO is not set
65CONFIG_IPV6=y 64CONFIG_IPV6=y
66CONFIG_NETFILTER=y 65CONFIG_NETFILTER=y
67# CONFIG_WIRELESS is not set 66CONFIG_CFG80211=y
67CONFIG_MAC80211=y
68CONFIG_RFKILL=y
69CONFIG_RFKILL_INPUT=y
68CONFIG_DEVTMPFS=y 70CONFIG_DEVTMPFS=y
69CONFIG_DEVTMPFS_MOUNT=y 71CONFIG_DEVTMPFS_MOUNT=y
70# CONFIG_STANDALONE is not set 72# CONFIG_STANDALONE is not set
73CONFIG_IMX_WEIM=y
71CONFIG_CONNECTOR=y 74CONFIG_CONNECTOR=y
72CONFIG_MTD=y 75CONFIG_MTD=y
73CONFIG_MTD_CMDLINE_PARTS=y 76CONFIG_MTD_CMDLINE_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 77CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y 78CONFIG_MTD_CFI=y
77CONFIG_MTD_JEDECPROBE=y 79CONFIG_MTD_JEDECPROBE=y
78CONFIG_MTD_CFI_INTELEXT=y 80CONFIG_MTD_CFI_INTELEXT=y
79CONFIG_MTD_CFI_AMDSTD=y 81CONFIG_MTD_CFI_AMDSTD=y
80CONFIG_MTD_CFI_STAA=y 82CONFIG_MTD_CFI_STAA=y
83CONFIG_MTD_PHYSMAP_OF=y
81CONFIG_MTD_DATAFLASH=y 84CONFIG_MTD_DATAFLASH=y
82CONFIG_MTD_M25P80=y 85CONFIG_MTD_M25P80=y
83CONFIG_MTD_SST25L=y 86CONFIG_MTD_SST25L=y
@@ -88,6 +91,7 @@ CONFIG_MTD_UBI=y
88CONFIG_BLK_DEV_LOOP=y 91CONFIG_BLK_DEV_LOOP=y
89CONFIG_BLK_DEV_RAM=y 92CONFIG_BLK_DEV_RAM=y
90CONFIG_BLK_DEV_RAM_SIZE=65536 93CONFIG_BLK_DEV_RAM_SIZE=65536
94CONFIG_SRAM=y
91CONFIG_EEPROM_AT24=y 95CONFIG_EEPROM_AT24=y
92CONFIG_EEPROM_AT25=y 96CONFIG_EEPROM_AT25=y
93# CONFIG_SCSI_PROC_FS is not set 97# CONFIG_SCSI_PROC_FS is not set
@@ -98,10 +102,11 @@ CONFIG_SCSI_LOGGING=y
98CONFIG_SCSI_SCAN_ASYNC=y 102CONFIG_SCSI_SCAN_ASYNC=y
99# CONFIG_SCSI_LOWLEVEL is not set 103# CONFIG_SCSI_LOWLEVEL is not set
100CONFIG_ATA=y 104CONFIG_ATA=y
105CONFIG_SATA_AHCI_PLATFORM=y
106CONFIG_AHCI_IMX=y
101CONFIG_PATA_IMX=y 107CONFIG_PATA_IMX=y
102CONFIG_NETDEVICES=y 108CONFIG_NETDEVICES=y
103# CONFIG_NET_VENDOR_BROADCOM is not set 109# CONFIG_NET_VENDOR_BROADCOM is not set
104# CONFIG_NET_VENDOR_CHELSIO is not set
105CONFIG_CS89x0=y 110CONFIG_CS89x0=y
106CONFIG_CS89x0_PLATFORM=y 111CONFIG_CS89x0_PLATFORM=y
107# CONFIG_NET_VENDOR_FARADAY is not set 112# CONFIG_NET_VENDOR_FARADAY is not set
@@ -115,7 +120,7 @@ CONFIG_SMC91X=y
115CONFIG_SMC911X=y 120CONFIG_SMC911X=y
116CONFIG_SMSC911X=y 121CONFIG_SMSC911X=y
117# CONFIG_NET_VENDOR_STMICRO is not set 122# CONFIG_NET_VENDOR_STMICRO is not set
118# CONFIG_WLAN is not set 123CONFIG_BRCMFMAC=m
119# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 124# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
120CONFIG_INPUT_EVDEV=y 125CONFIG_INPUT_EVDEV=y
121CONFIG_INPUT_EVBUG=m 126CONFIG_INPUT_EVBUG=m
@@ -124,6 +129,7 @@ CONFIG_KEYBOARD_IMX=y
124CONFIG_MOUSE_PS2=m 129CONFIG_MOUSE_PS2=m
125CONFIG_MOUSE_PS2_ELANTECH=y 130CONFIG_MOUSE_PS2_ELANTECH=y
126CONFIG_INPUT_TOUCHSCREEN=y 131CONFIG_INPUT_TOUCHSCREEN=y
132CONFIG_TOUCHSCREEN_EGALAX=y
127CONFIG_TOUCHSCREEN_MC13783=y 133CONFIG_TOUCHSCREEN_MC13783=y
128CONFIG_INPUT_MISC=y 134CONFIG_INPUT_MISC=y
129CONFIG_INPUT_MMA8450=y 135CONFIG_INPUT_MMA8450=y
@@ -134,6 +140,8 @@ CONFIG_LEGACY_PTY_COUNT=256
134# CONFIG_DEVKMEM is not set 140# CONFIG_DEVKMEM is not set
135CONFIG_SERIAL_IMX=y 141CONFIG_SERIAL_IMX=y
136CONFIG_SERIAL_IMX_CONSOLE=y 142CONFIG_SERIAL_IMX_CONSOLE=y
143CONFIG_SERIAL_FSL_LPUART=y
144CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
137CONFIG_HW_RANDOM=y 145CONFIG_HW_RANDOM=y
138CONFIG_HW_RANDOM_MXC_RNGA=y 146CONFIG_HW_RANDOM_MXC_RNGA=y
139CONFIG_I2C=y 147CONFIG_I2C=y
@@ -156,30 +164,26 @@ CONFIG_MFD_MC13XXX_SPI=y
156CONFIG_MFD_MC13XXX_I2C=y 164CONFIG_MFD_MC13XXX_I2C=y
157CONFIG_REGULATOR=y 165CONFIG_REGULATOR=y
158CONFIG_REGULATOR_FIXED_VOLTAGE=y 166CONFIG_REGULATOR_FIXED_VOLTAGE=y
159CONFIG_REGULATOR_DA9052=y
160CONFIG_REGULATOR_ANATOP=y 167CONFIG_REGULATOR_ANATOP=y
168CONFIG_REGULATOR_DA9052=y
161CONFIG_REGULATOR_MC13783=y 169CONFIG_REGULATOR_MC13783=y
162CONFIG_REGULATOR_MC13892=y 170CONFIG_REGULATOR_MC13892=y
163CONFIG_MEDIA_SUPPORT=y 171CONFIG_MEDIA_SUPPORT=y
164CONFIG_VIDEO_DEV=y
165CONFIG_V4L_PLATFORM_DRIVERS=y
166CONFIG_MEDIA_CAMERA_SUPPORT=y 172CONFIG_MEDIA_CAMERA_SUPPORT=y
173CONFIG_V4L_PLATFORM_DRIVERS=y
167CONFIG_SOC_CAMERA=y 174CONFIG_SOC_CAMERA=y
175CONFIG_VIDEO_MX3=y
176CONFIG_V4L_MEM2MEM_DRIVERS=y
177CONFIG_VIDEO_CODA=y
168CONFIG_SOC_CAMERA_OV2640=y 178CONFIG_SOC_CAMERA_OV2640=y
169CONFIG_DRM=y 179CONFIG_DRM=y
170CONFIG_VIDEO_MX3=y
171CONFIG_FB=y
172CONFIG_LCD_PLATFORM=y
173CONFIG_BACKLIGHT_LCD_SUPPORT=y 180CONFIG_BACKLIGHT_LCD_SUPPORT=y
174CONFIG_LCD_CLASS_DEVICE=y 181CONFIG_LCD_CLASS_DEVICE=y
175CONFIG_LCD_L4F00242T03=y 182CONFIG_LCD_L4F00242T03=y
183CONFIG_LCD_PLATFORM=y
176CONFIG_BACKLIGHT_CLASS_DEVICE=y 184CONFIG_BACKLIGHT_CLASS_DEVICE=y
177CONFIG_BACKLIGHT_PWM=y 185CONFIG_BACKLIGHT_PWM=y
178CONFIG_FRAMEBUFFER_CONSOLE=y 186CONFIG_FRAMEBUFFER_CONSOLE=y
179CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
180CONFIG_FONTS=y
181CONFIG_FONT_8x8=y
182CONFIG_FONT_8x16=y
183CONFIG_LOGO=y 187CONFIG_LOGO=y
184CONFIG_SOUND=y 188CONFIG_SOUND=y
185CONFIG_SND=y 189CONFIG_SND=y
@@ -193,11 +197,12 @@ CONFIG_SND_SOC_IMX_MC13783=y
193CONFIG_USB=y 197CONFIG_USB=y
194CONFIG_USB_EHCI_HCD=y 198CONFIG_USB_EHCI_HCD=y
195CONFIG_USB_EHCI_MXC=y 199CONFIG_USB_EHCI_MXC=y
200CONFIG_USB_STORAGE=y
196CONFIG_USB_CHIPIDEA=y 201CONFIG_USB_CHIPIDEA=y
197CONFIG_USB_CHIPIDEA_HOST=y 202CONFIG_USB_CHIPIDEA_HOST=y
198CONFIG_USB_PHY=y 203CONFIG_USB_PHY=y
204CONFIG_NOP_USB_XCEIV=y
199CONFIG_USB_MXS_PHY=y 205CONFIG_USB_MXS_PHY=y
200CONFIG_USB_STORAGE=y
201CONFIG_MMC=y 206CONFIG_MMC=y
202CONFIG_MMC_SDHCI=y 207CONFIG_MMC_SDHCI=y
203CONFIG_MMC_SDHCI_PLTFM=y 208CONFIG_MMC_SDHCI_PLTFM=y
@@ -214,9 +219,10 @@ CONFIG_IMX_SDMA=y
214CONFIG_MXS_DMA=y 219CONFIG_MXS_DMA=y
215CONFIG_STAGING=y 220CONFIG_STAGING=y
216CONFIG_DRM_IMX=y 221CONFIG_DRM_IMX=y
217CONFIG_DRM_IMX_TVE=y
218CONFIG_DRM_IMX_FB_HELPER=y 222CONFIG_DRM_IMX_FB_HELPER=y
219CONFIG_DRM_IMX_PARALLEL_DISPLAY=y 223CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
224CONFIG_DRM_IMX_TVE=y
225CONFIG_DRM_IMX_LDB=y
220CONFIG_DRM_IMX_IPUV3_CORE=y 226CONFIG_DRM_IMX_IPUV3_CORE=y
221CONFIG_DRM_IMX_IPUV3=y 227CONFIG_DRM_IMX_IPUV3=y
222CONFIG_COMMON_CLK_DEBUG=y 228CONFIG_COMMON_CLK_DEBUG=y
@@ -270,3 +276,6 @@ CONFIG_CRC_CCITT=m
270CONFIG_CRC_T10DIF=y 276CONFIG_CRC_T10DIF=y
271CONFIG_CRC7=m 277CONFIG_CRC7=m
272CONFIG_LIBCRC32C=m 278CONFIG_LIBCRC32C=m
279CONFIG_FONTS=y
280CONFIG_FONT_8x8=y
281CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig
index 2f52083..2a439fe 100644
--- a/recipes-kernel/linux/linux-fslc/mxs/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig
@@ -68,12 +68,12 @@ CONFIG_SCSI=y
68CONFIG_BLK_DEV_SD=y 68CONFIG_BLK_DEV_SD=y
69CONFIG_NETDEVICES=y 69CONFIG_NETDEVICES=y
70CONFIG_ENC28J60=y 70CONFIG_ENC28J60=y
71CONFIG_USB_USBNET=y
72CONFIG_USB_NET_SMSC95XX=y
73CONFIG_SMSC_PHY=y 71CONFIG_SMSC_PHY=y
74CONFIG_ICPLUS_PHY=y 72CONFIG_ICPLUS_PHY=y
75CONFIG_REALTEK_PHY=y 73CONFIG_REALTEK_PHY=y
76CONFIG_MICREL_PHY=y 74CONFIG_MICREL_PHY=y
75CONFIG_USB_USBNET=y
76CONFIG_USB_NET_SMSC95XX=y
77# CONFIG_WLAN is not set 77# CONFIG_WLAN is not set
78# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 78# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
79CONFIG_INPUT_EVDEV=y 79CONFIG_INPUT_EVDEV=y
@@ -112,7 +112,6 @@ CONFIG_LCD_CLASS_DEVICE=y
112CONFIG_BACKLIGHT_CLASS_DEVICE=y 112CONFIG_BACKLIGHT_CLASS_DEVICE=y
113CONFIG_BACKLIGHT_PWM=y 113CONFIG_BACKLIGHT_PWM=y
114CONFIG_FRAMEBUFFER_CONSOLE=y 114CONFIG_FRAMEBUFFER_CONSOLE=y
115CONFIG_FONTS=y
116CONFIG_LOGO=y 115CONFIG_LOGO=y
117CONFIG_SOUND=y 116CONFIG_SOUND=y
118CONFIG_SND=y 117CONFIG_SND=y
@@ -121,9 +120,9 @@ CONFIG_SND_MXS_SOC=y
121CONFIG_SND_SOC_MXS_SGTL5000=y 120CONFIG_SND_SOC_MXS_SGTL5000=y
122CONFIG_USB=y 121CONFIG_USB=y
123CONFIG_USB_EHCI_HCD=y 122CONFIG_USB_EHCI_HCD=y
123CONFIG_USB_STORAGE=y
124CONFIG_USB_CHIPIDEA=y 124CONFIG_USB_CHIPIDEA=y
125CONFIG_USB_CHIPIDEA_HOST=y 125CONFIG_USB_CHIPIDEA_HOST=y
126CONFIG_USB_STORAGE=y
127CONFIG_USB_PHY=y 126CONFIG_USB_PHY=y
128CONFIG_USB_MXS_PHY=y 127CONFIG_USB_MXS_PHY=y
129CONFIG_MMC=y 128CONFIG_MMC=y
@@ -145,9 +144,9 @@ CONFIG_DMADEVICES=y
145CONFIG_MXS_DMA=y 144CONFIG_MXS_DMA=y
146CONFIG_STAGING=y 145CONFIG_STAGING=y
147CONFIG_MXS_LRADC=y 146CONFIG_MXS_LRADC=y
148CONFIG_IIO_SYSFS_TRIGGER=y
149CONFIG_COMMON_CLK_DEBUG=y 147CONFIG_COMMON_CLK_DEBUG=y
150CONFIG_IIO=y 148CONFIG_IIO=y
149CONFIG_IIO_SYSFS_TRIGGER=y
151CONFIG_PWM=y 150CONFIG_PWM=y
152CONFIG_PWM_MXS=y 151CONFIG_PWM_MXS=y
153CONFIG_EXT2_FS=y 152CONFIG_EXT2_FS=y
@@ -176,14 +175,14 @@ CONFIG_NLS_CODEPAGE_850=y
176CONFIG_NLS_ISO8859_1=y 175CONFIG_NLS_ISO8859_1=y
177CONFIG_NLS_ISO8859_15=y 176CONFIG_NLS_ISO8859_15=y
178CONFIG_PRINTK_TIME=y 177CONFIG_PRINTK_TIME=y
178CONFIG_DEBUG_INFO=y
179CONFIG_FRAME_WARN=2048 179CONFIG_FRAME_WARN=2048
180CONFIG_MAGIC_SYSRQ=y
181CONFIG_UNUSED_SYMBOLS=y 180CONFIG_UNUSED_SYMBOLS=y
181CONFIG_MAGIC_SYSRQ=y
182CONFIG_DEBUG_KERNEL=y 182CONFIG_DEBUG_KERNEL=y
183CONFIG_LOCKUP_DETECTOR=y 183CONFIG_LOCKUP_DETECTOR=y
184CONFIG_TIMER_STATS=y 184CONFIG_TIMER_STATS=y
185CONFIG_PROVE_LOCKING=y 185CONFIG_PROVE_LOCKING=y
186CONFIG_DEBUG_INFO=y
187CONFIG_BLK_DEV_IO_TRACE=y 186CONFIG_BLK_DEV_IO_TRACE=y
188CONFIG_STRICT_DEVMEM=y 187CONFIG_STRICT_DEVMEM=y
189CONFIG_DEBUG_USER=y 188CONFIG_DEBUG_USER=y
@@ -191,3 +190,4 @@ CONFIG_DEBUG_USER=y
191# CONFIG_CRYPTO_HW is not set 190# CONFIG_CRYPTO_HW is not set
192CONFIG_CRC_ITU_T=m 191CONFIG_CRC_ITU_T=m
193CONFIG_CRC7=m 192CONFIG_CRC7=m
193CONFIG_FONTS=y
diff --git a/recipes-kernel/linux/linux-fslc_3.11.bb b/recipes-kernel/linux/linux-fslc_3.12.bb
index 3f8cb3a..cab2c3b 100644
--- a/recipes-kernel/linux/linux-fslc_3.11.bb
+++ b/recipes-kernel/linux/linux-fslc_3.12.bb
@@ -3,9 +3,9 @@
3 3
4include linux-fslc.inc 4include linux-fslc.inc
5 5
6PV = "3.11+git${SRCPV}" 6PV = "3.12+git${SRCPV}"
7 7
8# patches-3.11 8# patches-3.12
9SRCREV = "a318c1dd398d8cb44e98964825ab038010793142" 9SRCREV = "83cc0743f5cbcf1f741867d5c193b09dd9be1adf"
10 10
11COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" 11COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"