diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-19 23:14:53 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-20 13:46:47 -0300 |
commit | 4c291af7056e44ffb997fccd95342caef7fd7c19 (patch) | |
tree | 2ae42cb7b5e7209b042689bccd656862179b9f82 | |
parent | 7c869ff2634a39d1d64bd81ab9474e1386c167f6 (diff) | |
download | meta-fsl-arm-4c291af7056e44ffb997fccd95342caef7fd7c19.tar.gz |
linux-fslc: Update to 3.10 based kernel
This updates the kernel based on 3.10.7 tree. It includes following
patches on top of it:
9cb4091 ASoC: mxs: move to use generic DMA helper
2a0977a ASoC: mxs: mxs-saif: Let device core handle pinctrl
3e8e9cd ARM: dts: imx23-olinuxino: enable Low Resolution ADC
bcf1891 ARM: dts: imx23-evk: enable Low Resolution ADC
16eeea9 ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle
8e005fb ARM: dts: imx23-evk: enable USB PHY and controller
7621ab6 iio: mxs-lradc: Fix misuse of iio->trig
70b12b8 iio: mxs-lradc: Remove useless check in read_raw
e401940 staging/iio/mxs-lradc: cleanup masklength
ab16015 staging:iio:adc: Use kstrtol()/kstrtoul()
96120e4 ARM: dts: imx28-evk: Enable touchscreen support
Change-Id: Ibf0fde9579d70c51d2a3abd09b4015145e3f3525
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 17 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mxs/defconfig | 7 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_3.10.bb (renamed from recipes-kernel/linux/linux-fslc_3.9.bb) | 6 |
3 files changed, 25 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 8e10e3a..5be5d0d 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -9,6 +9,7 @@ CONFIG_CGROUPS=y | |||
9 | CONFIG_RELAY=y | 9 | CONFIG_RELAY=y |
10 | CONFIG_BLK_DEV_INITRD=y | 10 | CONFIG_BLK_DEV_INITRD=y |
11 | CONFIG_EXPERT=y | 11 | CONFIG_EXPERT=y |
12 | CONFIG_PERF_EVENTS=y | ||
12 | # CONFIG_SLUB_DEBUG is not set | 13 | # CONFIG_SLUB_DEBUG is not set |
13 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
14 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
@@ -17,6 +18,9 @@ CONFIG_MODVERSIONS=y | |||
17 | CONFIG_MODULE_SRCVERSION_ALL=y | 18 | CONFIG_MODULE_SRCVERSION_ALL=y |
18 | # CONFIG_BLK_DEV_BSG is not set | 19 | # CONFIG_BLK_DEV_BSG is not set |
19 | CONFIG_ARCH_MXC=y | 20 | CONFIG_ARCH_MXC=y |
21 | CONFIG_ARCH_MULTI_V6=y | ||
22 | CONFIG_ARCH_MULTI_V7=y | ||
23 | CONFIG_MACH_IMX31_DT=y | ||
20 | CONFIG_MACH_MX31LILLY=y | 24 | CONFIG_MACH_MX31LILLY=y |
21 | CONFIG_MACH_MX31LITE=y | 25 | CONFIG_MACH_MX31LITE=y |
22 | CONFIG_MACH_PCM037=y | 26 | CONFIG_MACH_PCM037=y |
@@ -30,7 +34,6 @@ CONFIG_MACH_PCM043=y | |||
30 | CONFIG_MACH_MX35_3DS=y | 34 | CONFIG_MACH_MX35_3DS=y |
31 | CONFIG_MACH_VPR200=y | 35 | CONFIG_MACH_VPR200=y |
32 | CONFIG_MACH_IMX51_DT=y | 36 | CONFIG_MACH_IMX51_DT=y |
33 | CONFIG_MACH_MX51_3DS=y | ||
34 | CONFIG_MACH_EUKREA_CPUIMX51SD=y | 37 | CONFIG_MACH_EUKREA_CPUIMX51SD=y |
35 | CONFIG_SOC_IMX53=y | 38 | CONFIG_SOC_IMX53=y |
36 | CONFIG_SOC_IMX6Q=y | 39 | CONFIG_SOC_IMX6Q=y |
@@ -57,6 +60,7 @@ CONFIG_IP_PNP_DHCP=y | |||
57 | # CONFIG_INET_XFRM_MODE_BEET is not set | 60 | # CONFIG_INET_XFRM_MODE_BEET is not set |
58 | # CONFIG_INET_LRO is not set | 61 | # CONFIG_INET_LRO is not set |
59 | CONFIG_IPV6=y | 62 | CONFIG_IPV6=y |
63 | CONFIG_NETFILTER=y | ||
60 | # CONFIG_WIRELESS is not set | 64 | # CONFIG_WIRELESS is not set |
61 | CONFIG_DEVTMPFS=y | 65 | CONFIG_DEVTMPFS=y |
62 | CONFIG_DEVTMPFS_MOUNT=y | 66 | CONFIG_DEVTMPFS_MOUNT=y |
@@ -144,17 +148,22 @@ CONFIG_GPIO_MC9S08DZ60=y | |||
144 | # CONFIG_HWMON is not set | 148 | # CONFIG_HWMON is not set |
145 | CONFIG_WATCHDOG=y | 149 | CONFIG_WATCHDOG=y |
146 | CONFIG_IMX2_WDT=y | 150 | CONFIG_IMX2_WDT=y |
151 | CONFIG_MFD_DA9052_I2C=y | ||
147 | CONFIG_MFD_MC13XXX_SPI=y | 152 | CONFIG_MFD_MC13XXX_SPI=y |
148 | CONFIG_MFD_MC13XXX_I2C=y | 153 | CONFIG_MFD_MC13XXX_I2C=y |
149 | CONFIG_REGULATOR=y | 154 | CONFIG_REGULATOR=y |
150 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 155 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
156 | CONFIG_REGULATOR_DA9052=y | ||
157 | CONFIG_REGULATOR_ANATOP=y | ||
151 | CONFIG_REGULATOR_MC13783=y | 158 | CONFIG_REGULATOR_MC13783=y |
152 | CONFIG_REGULATOR_MC13892=y | 159 | CONFIG_REGULATOR_MC13892=y |
153 | CONFIG_MEDIA_SUPPORT=y | 160 | CONFIG_MEDIA_SUPPORT=y |
154 | CONFIG_VIDEO_DEV=y | 161 | CONFIG_VIDEO_DEV=y |
155 | CONFIG_V4L_PLATFORM_DRIVERS=y | 162 | CONFIG_V4L_PLATFORM_DRIVERS=y |
163 | CONFIG_MEDIA_CAMERA_SUPPORT=y | ||
156 | CONFIG_SOC_CAMERA=y | 164 | CONFIG_SOC_CAMERA=y |
157 | CONFIG_SOC_CAMERA_OV2640=y | 165 | CONFIG_SOC_CAMERA_OV2640=y |
166 | CONFIG_DRM=y | ||
158 | CONFIG_VIDEO_MX3=y | 167 | CONFIG_VIDEO_MX3=y |
159 | CONFIG_FB=y | 168 | CONFIG_FB=y |
160 | CONFIG_LCD_PLATFORM=y | 169 | CONFIG_LCD_PLATFORM=y |
@@ -181,6 +190,7 @@ CONFIG_USB_EHCI_HCD=y | |||
181 | CONFIG_USB_EHCI_MXC=y | 190 | CONFIG_USB_EHCI_MXC=y |
182 | CONFIG_USB_CHIPIDEA=y | 191 | CONFIG_USB_CHIPIDEA=y |
183 | CONFIG_USB_CHIPIDEA_HOST=y | 192 | CONFIG_USB_CHIPIDEA_HOST=y |
193 | CONFIG_USB_PHY=y | ||
184 | CONFIG_USB_MXS_PHY=y | 194 | CONFIG_USB_MXS_PHY=y |
185 | CONFIG_USB_STORAGE=y | 195 | CONFIG_USB_STORAGE=y |
186 | CONFIG_MMC=y | 196 | CONFIG_MMC=y |
@@ -193,9 +203,14 @@ CONFIG_RTC_CLASS=y | |||
193 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 203 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
194 | CONFIG_RTC_DRV_MC13XXX=y | 204 | CONFIG_RTC_DRV_MC13XXX=y |
195 | CONFIG_RTC_DRV_MXC=y | 205 | CONFIG_RTC_DRV_MXC=y |
206 | CONFIG_RTC_DRV_SNVS=y | ||
196 | CONFIG_DMADEVICES=y | 207 | CONFIG_DMADEVICES=y |
197 | CONFIG_IMX_SDMA=y | 208 | CONFIG_IMX_SDMA=y |
198 | CONFIG_MXS_DMA=y | 209 | CONFIG_MXS_DMA=y |
210 | CONFIG_STAGING=y | ||
211 | CONFIG_DRM_IMX=y | ||
212 | CONFIG_DRM_IMX_IPUV3_CORE=y | ||
213 | CONFIG_DRM_IMX_IPUV3=y | ||
199 | CONFIG_COMMON_CLK_DEBUG=y | 214 | CONFIG_COMMON_CLK_DEBUG=y |
200 | # CONFIG_IOMMU_SUPPORT is not set | 215 | # CONFIG_IOMMU_SUPPORT is not set |
201 | CONFIG_EXT2_FS=y | 216 | CONFIG_EXT2_FS=y |
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index 084dae9..2f52083 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig | |||
@@ -22,8 +22,8 @@ CONFIG_MODVERSIONS=y | |||
22 | CONFIG_BLK_DEV_INTEGRITY=y | 22 | CONFIG_BLK_DEV_INTEGRITY=y |
23 | # CONFIG_IOSCHED_DEADLINE is not set | 23 | # CONFIG_IOSCHED_DEADLINE is not set |
24 | # CONFIG_IOSCHED_CFQ is not set | 24 | # CONFIG_IOSCHED_CFQ is not set |
25 | # CONFIG_ARCH_MULTI_V7 is not set | ||
25 | CONFIG_ARCH_MXS=y | 26 | CONFIG_ARCH_MXS=y |
26 | CONFIG_MACH_MXS_DT=y | ||
27 | # CONFIG_ARM_THUMB is not set | 27 | # CONFIG_ARM_THUMB is not set |
28 | CONFIG_PREEMPT_VOLUNTARY=y | 28 | CONFIG_PREEMPT_VOLUNTARY=y |
29 | CONFIG_AEABI=y | 29 | CONFIG_AEABI=y |
@@ -101,6 +101,8 @@ CONFIG_SPI_MXS=y | |||
101 | CONFIG_DEBUG_GPIO=y | 101 | CONFIG_DEBUG_GPIO=y |
102 | CONFIG_GPIO_SYSFS=y | 102 | CONFIG_GPIO_SYSFS=y |
103 | # CONFIG_HWMON is not set | 103 | # CONFIG_HWMON is not set |
104 | CONFIG_WATCHDOG=y | ||
105 | CONFIG_STMP3XXX_RTC_WATCHDOG=y | ||
104 | CONFIG_REGULATOR=y | 106 | CONFIG_REGULATOR=y |
105 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 107 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
106 | CONFIG_FB=y | 108 | CONFIG_FB=y |
@@ -122,6 +124,7 @@ CONFIG_USB_EHCI_HCD=y | |||
122 | CONFIG_USB_CHIPIDEA=y | 124 | CONFIG_USB_CHIPIDEA=y |
123 | CONFIG_USB_CHIPIDEA_HOST=y | 125 | CONFIG_USB_CHIPIDEA_HOST=y |
124 | CONFIG_USB_STORAGE=y | 126 | CONFIG_USB_STORAGE=y |
127 | CONFIG_USB_PHY=y | ||
125 | CONFIG_USB_MXS_PHY=y | 128 | CONFIG_USB_MXS_PHY=y |
126 | CONFIG_MMC=y | 129 | CONFIG_MMC=y |
127 | CONFIG_MMC_UNSAFE_RESUME=y | 130 | CONFIG_MMC_UNSAFE_RESUME=y |
@@ -147,6 +150,8 @@ CONFIG_COMMON_CLK_DEBUG=y | |||
147 | CONFIG_IIO=y | 150 | CONFIG_IIO=y |
148 | CONFIG_PWM=y | 151 | CONFIG_PWM=y |
149 | CONFIG_PWM_MXS=y | 152 | CONFIG_PWM_MXS=y |
153 | CONFIG_EXT2_FS=y | ||
154 | CONFIG_EXT2_FS_XATTR=y | ||
150 | CONFIG_EXT3_FS=y | 155 | CONFIG_EXT3_FS=y |
151 | CONFIG_EXT4_FS=y | 156 | CONFIG_EXT4_FS=y |
152 | # CONFIG_DNOTIFY is not set | 157 | # CONFIG_DNOTIFY is not set |
diff --git a/recipes-kernel/linux/linux-fslc_3.9.bb b/recipes-kernel/linux/linux-fslc_3.10.bb index b98890a..7fa0ffe 100644 --- a/recipes-kernel/linux/linux-fslc_3.9.bb +++ b/recipes-kernel/linux/linux-fslc_3.10.bb | |||
@@ -3,9 +3,9 @@ | |||
3 | 3 | ||
4 | include linux-fslc.inc | 4 | include linux-fslc.inc |
5 | 5 | ||
6 | PV = "3.9+git${SRCPV}" | 6 | PV = "3.10+git${SRCPV}" |
7 | 7 | ||
8 | # patches-3.9 | 8 | # patches-3.10 |
9 | SRCREV = "3a1e70d10297f92525eee3bd35aae7ecab201c39" | 9 | SRCREV = "9cb40913a68945ab653b58abdf5949c68dd85210" |
10 | 10 | ||
11 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 11 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |