summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-imx-2.6.35.3
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-07-03 10:36:45 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-07-10 09:01:53 -0300
commit677454ee58570c64364de67b5f63c7303bcb998a (patch)
treefd47f06f457ba457eb3785fd2755d1803e99d7ce /recipes-kernel/linux/linux-imx-2.6.35.3
parentec02655bbd203983db871119ba8df8d376dbba11 (diff)
downloadmeta-fsl-arm-677454ee58570c64364de67b5f63c7303bcb998a.tar.gz
linux-imx (2.6.35.3): Sync i.MX5 and i.MX28 defconfig files
This runs each defconfig against 'oldconfig' and update it as this kernel does not yet provide 'savedefconfig' command. Change-Id: Id19c6acdb029662041a82ac6cf4c828a1c6cfc0a Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/linux-imx-2.6.35.3')
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig72
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig4
2 files changed, 55 insertions, 21 deletions
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
index dbb4eaa..7dad19d 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.35.3 3# Linux kernel version: 2.6.35.3
4# Mon Dec 6 17:17:47 2010 4# Tue Jul 2 16:27:45 2013
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -102,7 +102,6 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 104CONFIG_SHMEM=y
105# CONFIG_ASHMEM is not set
106CONFIG_AIO=y 105CONFIG_AIO=y
107CONFIG_HAVE_PERF_EVENTS=y 106CONFIG_HAVE_PERF_EVENTS=y
108CONFIG_PERF_USE_VMALLOC=y 107CONFIG_PERF_USE_VMALLOC=y
@@ -505,7 +504,6 @@ CONFIG_WIRELESS=y
505CONFIG_WIRELESS_EXT=y 504CONFIG_WIRELESS_EXT=y
506CONFIG_WEXT_CORE=y 505CONFIG_WEXT_CORE=y
507CONFIG_WEXT_PROC=y 506CONFIG_WEXT_PROC=y
508CONFIG_WEXT_SPY=y
509CONFIG_WEXT_PRIV=y 507CONFIG_WEXT_PRIV=y
510# CONFIG_CFG80211 is not set 508# CONFIG_CFG80211 is not set
511CONFIG_WIRELESS_EXT_SYSFS=y 509CONFIG_WIRELESS_EXT_SYSFS=y
@@ -595,6 +593,7 @@ CONFIG_MTD_CFI_I2=y
595# 593#
596# CONFIG_MTD_DATAFLASH is not set 594# CONFIG_MTD_DATAFLASH is not set
597# CONFIG_MTD_MXC_DATAFLASH is not set 595# CONFIG_MTD_MXC_DATAFLASH is not set
596# CONFIG_MTD_MXC_M25P80 is not set
598CONFIG_MTD_M25P80=m 597CONFIG_MTD_M25P80=m
599CONFIG_M25PXX_USE_FAST_READ=y 598CONFIG_M25PXX_USE_FAST_READ=y
600# CONFIG_MTD_SST25L is not set 599# CONFIG_MTD_SST25L is not set
@@ -670,10 +669,8 @@ CONFIG_MISC_DEVICES=y
670# CONFIG_DS1682 is not set 669# CONFIG_DS1682 is not set
671# CONFIG_TI_DAC7512 is not set 670# CONFIG_TI_DAC7512 is not set
672CONFIG_MXS_PERSISTENT=y 671CONFIG_MXS_PERSISTENT=y
673# CONFIG_ANDROID_PMEM is not set
674# CONFIG_UID_STAT is not set
675# CONFIG_C2PORT is not set
676CONFIG_MXS_PERFMON=y 672CONFIG_MXS_PERFMON=y
673# CONFIG_C2PORT is not set
677 674
678# 675#
679# EEPROM support 676# EEPROM support
@@ -781,6 +778,7 @@ CONFIG_MII=y
781# CONFIG_KS8851 is not set 778# CONFIG_KS8851 is not set
782# CONFIG_KS8851_MLL is not set 779# CONFIG_KS8851_MLL is not set
783CONFIG_FEC=y 780CONFIG_FEC=y
781# CONFIG_FEC_NAPI is not set
784# CONFIG_FEC_1588 is not set 782# CONFIG_FEC_1588 is not set
785# CONFIG_FEC2 is not set 783# CONFIG_FEC2 is not set
786# CONFIG_NETDEV_1000 is not set 784# CONFIG_NETDEV_1000 is not set
@@ -788,17 +786,6 @@ CONFIG_FEC=y
788CONFIG_WLAN=y 786CONFIG_WLAN=y
789# CONFIG_USB_ZD1201 is not set 787# CONFIG_USB_ZD1201 is not set
790# CONFIG_HOSTAP is not set 788# CONFIG_HOSTAP is not set
791CONFIG_ATH6K_LEGACY=m
792CONFIG_AR600x_SD31_XXX=y
793# CONFIG_AR600x_WB31_XXX is not set
794# CONFIG_AR600x_SD32_XXX is not set
795# CONFIG_AR600x_CUSTOM_XXX is not set
796# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
797# CONFIG_ATH6KL_HCI_BRIDGE is not set
798# CONFIG_ATH6KL_CFG80211 is not set
799# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
800# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
801# CONFIG_ATH6KL_DEBUG is not set
802 789
803# 790#
804# Enable WiMAX (Networking options) to see the WiMAX drivers 791# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -861,6 +848,7 @@ CONFIG_KEYBOARD_ATKBD=y
861# CONFIG_KEYBOARD_SUNKBD is not set 848# CONFIG_KEYBOARD_SUNKBD is not set
862# CONFIG_KEYBOARD_XTKBD is not set 849# CONFIG_KEYBOARD_XTKBD is not set
863CONFIG_KEYBOARD_MXS=y 850CONFIG_KEYBOARD_MXS=y
851# CONFIG_KEYBOARD_MPR121 is not set
864CONFIG_INPUT_MOUSE=y 852CONFIG_INPUT_MOUSE=y
865CONFIG_MOUSE_PS2=y 853CONFIG_MOUSE_PS2=y
866CONFIG_MOUSE_PS2_ALPS=y 854CONFIG_MOUSE_PS2_ALPS=y
@@ -908,6 +896,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
908# CONFIG_TOUCHSCREEN_DYNAPRO is not set 896# CONFIG_TOUCHSCREEN_DYNAPRO is not set
909# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set 897# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
910# CONFIG_TOUCHSCREEN_EETI is not set 898# CONFIG_TOUCHSCREEN_EETI is not set
899# CONFIG_TOUCHSCREEN_EGALAX is not set
911# CONFIG_TOUCHSCREEN_FUJITSU is not set 900# CONFIG_TOUCHSCREEN_FUJITSU is not set
912CONFIG_TOUCHSCREEN_GUNZE=m 901CONFIG_TOUCHSCREEN_GUNZE=m
913# CONFIG_TOUCHSCREEN_ELO is not set 902# CONFIG_TOUCHSCREEN_ELO is not set
@@ -925,6 +914,8 @@ CONFIG_TOUCHSCREEN_MXS=y
925# CONFIG_TOUCHSCREEN_TSC2007 is not set 914# CONFIG_TOUCHSCREEN_TSC2007 is not set
926# CONFIG_TOUCHSCREEN_W90X900 is not set 915# CONFIG_TOUCHSCREEN_W90X900 is not set
927# CONFIG_TOUCHSCREEN_TPS6507X is not set 916# CONFIG_TOUCHSCREEN_TPS6507X is not set
917# CONFIG_TOUCHSCREEN_P1003 is not set
918# CONFIG_TOUCHSCREEN_MAX11801 is not set
928CONFIG_INPUT_MISC=y 919CONFIG_INPUT_MISC=y
929# CONFIG_INPUT_AD714X is not set 920# CONFIG_INPUT_AD714X is not set
930# CONFIG_INPUT_ATI_REMOTE is not set 921# CONFIG_INPUT_ATI_REMOTE is not set
@@ -936,6 +927,7 @@ CONFIG_INPUT_MISC=y
936CONFIG_INPUT_UINPUT=m 927CONFIG_INPUT_UINPUT=m
937# CONFIG_INPUT_PCF8574 is not set 928# CONFIG_INPUT_PCF8574 is not set
938# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set 929# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
930# CONFIG_INPUT_ISL29023 is not set
939 931
940# 932#
941# Hardware I/O ports 933# Hardware I/O ports
@@ -1159,6 +1151,7 @@ CONFIG_MFD_SUPPORT=y
1159# CONFIG_MFD_LTC3589_I2C is not set 1151# CONFIG_MFD_LTC3589_I2C is not set
1160# CONFIG_MFD_PCF50633 is not set 1152# CONFIG_MFD_PCF50633 is not set
1161# CONFIG_MFD_MC13783 is not set 1153# CONFIG_MFD_MC13783 is not set
1154# CONFIG_PMIC_DA9052 is not set
1162# CONFIG_ABX500_CORE is not set 1155# CONFIG_ABX500_CORE is not set
1163# CONFIG_EZX_PCAP is not set 1156# CONFIG_EZX_PCAP is not set
1164# CONFIG_AB8500_CORE is not set 1157# CONFIG_AB8500_CORE is not set
@@ -1597,7 +1590,6 @@ CONFIG_USB_GADGET_SELECTED=y
1597# CONFIG_USB_GADGET_GOKU is not set 1590# CONFIG_USB_GADGET_GOKU is not set
1598CONFIG_USB_GADGET_ARC=y 1591CONFIG_USB_GADGET_ARC=y
1599CONFIG_USB_ARC=y 1592CONFIG_USB_ARC=y
1600CONFIG_WORKAROUND_ARCUSB_REG_RW=y
1601# CONFIG_USB_GADGET_LANGWELL is not set 1593# CONFIG_USB_GADGET_LANGWELL is not set
1602# CONFIG_USB_GADGET_DUMMY_HCD is not set 1594# CONFIG_USB_GADGET_DUMMY_HCD is not set
1603CONFIG_USB_GADGET_DUALSPEED=y 1595CONFIG_USB_GADGET_DUALSPEED=y
@@ -1744,7 +1736,45 @@ CONFIG_DMADEVICES=y
1744# CONFIG_AUXDISPLAY is not set 1736# CONFIG_AUXDISPLAY is not set
1745# CONFIG_UIO is not set 1737# CONFIG_UIO is not set
1746CONFIG_STAGING=y 1738CONFIG_STAGING=y
1747CONFIG_STAGING_EXCLUDE_BUILD=n 1739# CONFIG_STAGING_EXCLUDE_BUILD is not set
1740# CONFIG_VIDEO_TM6000 is not set
1741# CONFIG_USB_IP_COMMON is not set
1742# CONFIG_PRISM2_USB is not set
1743# CONFIG_ECHO is not set
1744# CONFIG_RT2870 is not set
1745# CONFIG_COMEDI is not set
1746# CONFIG_ASUS_OLED is not set
1747# CONFIG_TRANZPORT is not set
1748# CONFIG_POHMELFS is not set
1749# CONFIG_LINE6_USB is not set
1750# CONFIG_VT6656 is not set
1751# CONFIG_FB_UDL is not set
1752
1753#
1754# RAR Register Driver
1755#
1756# CONFIG_IIO is not set
1757# CONFIG_RAMZSWAP is not set
1758# CONFIG_BATMAN_ADV is not set
1759# CONFIG_FB_SM7XX is not set
1760
1761#
1762# Texas Instruments shared transport line discipline
1763#
1764# CONFIG_TI_ST is not set
1765# CONFIG_ADIS16255 is not set
1766CONFIG_ATH6K_LEGACY=m
1767CONFIG_AR600x_SD31_XXX=y
1768# CONFIG_AR600x_WB31_XXX is not set
1769# CONFIG_AR600x_SD32_XXX is not set
1770# CONFIG_AR600x_CUSTOM_XXX is not set
1771# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
1772# CONFIG_ATH6KL_HCI_BRIDGE is not set
1773# CONFIG_ATH6KL_CFG80211 is not set
1774# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
1775# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
1776# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
1777# CONFIG_ATH6KL_DEBUG is not set
1748 1778
1749# 1779#
1750# File systems 1780# File systems
@@ -1865,13 +1895,15 @@ CONFIG_NFS_FS=y
1865CONFIG_NFS_V3=y 1895CONFIG_NFS_V3=y
1866# CONFIG_NFS_V3_ACL is not set 1896# CONFIG_NFS_V3_ACL is not set
1867CONFIG_NFS_V4=y 1897CONFIG_NFS_V4=y
1898# CONFIG_NFS_V4_1 is not set
1868CONFIG_ROOT_NFS=y 1899CONFIG_ROOT_NFS=y
1869# CONFIG_NFSD is not set 1900# CONFIG_NFSD is not set
1870CONFIG_LOCKD=y 1901CONFIG_LOCKD=y
1871CONFIG_LOCKD_V4=y 1902CONFIG_LOCKD_V4=y
1872CONFIG_NFS_COMMON=y 1903CONFIG_NFS_COMMON=y
1873CONFIG_SUNRPC=y 1904CONFIG_SUNRPC=y
1874# CONFIG_RPCSEC_GSS_KRB5 is not set 1905CONFIG_SUNRPC_GSS=y
1906CONFIG_RPCSEC_GSS_KRB5=y
1875# CONFIG_RPCSEC_GSS_SPKM3 is not set 1907# CONFIG_RPCSEC_GSS_SPKM3 is not set
1876# CONFIG_SMB_FS is not set 1908# CONFIG_SMB_FS is not set
1877# CONFIG_CEPH_FS is not set 1909# CONFIG_CEPH_FS is not set
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig
index c2a11cb..f0dd04d 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.35.3 3# Linux kernel version: 2.6.35.3
4# Tue Sep 11 14:37:32 2012 4# Tue Jul 2 16:23:28 2013
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_HAVE_PWM=y 7CONFIG_HAVE_PWM=y
@@ -522,6 +522,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
522# Network testing 522# Network testing
523# 523#
524# CONFIG_NET_PKTGEN is not set 524# CONFIG_NET_PKTGEN is not set
525# CONFIG_NET_TCPPROBE is not set
525# CONFIG_HAMRADIO is not set 526# CONFIG_HAMRADIO is not set
526CONFIG_CAN=y 527CONFIG_CAN=y
527CONFIG_CAN_RAW=y 528CONFIG_CAN_RAW=y
@@ -874,6 +875,7 @@ CONFIG_SMSC911X=y
874# CONFIG_KS8851 is not set 875# CONFIG_KS8851 is not set
875# CONFIG_KS8851_MLL is not set 876# CONFIG_KS8851_MLL is not set
876CONFIG_FEC=y 877CONFIG_FEC=y
878# CONFIG_FEC_NAPI is not set
877# CONFIG_FEC_1588 is not set 879# CONFIG_FEC_1588 is not set
878# CONFIG_FEC2 is not set 880# CONFIG_FEC2 is not set
879# CONFIG_NETDEV_1000 is not set 881# CONFIG_NETDEV_1000 is not set