From: Otavio Salvador Date: Wed, 3 Jul 2013 13:36:45 +0000 (-0300) Subject: linux-imx (2.6.35.3): Sync i.MX5 and i.MX28 defconfig files X-Git-Tag: 2.1~1322 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=47efe2714f4f60d6ea63ec98c42d7dfa70f54bb5;p=meta-freescale.git 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 --- diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig index dbb4eaa6..7dad19df 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.3 -# Mon Dec 6 17:17:47 2010 +# Tue Jul 2 16:27:45 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -102,7 +102,6 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y -# CONFIG_ASHMEM is not set CONFIG_AIO=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y @@ -505,7 +504,6 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y # CONFIG_CFG80211 is not set CONFIG_WIRELESS_EXT_SYSFS=y @@ -595,6 +593,7 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_DATAFLASH is not set # CONFIG_MTD_MXC_DATAFLASH is not set +# CONFIG_MTD_MXC_M25P80 is not set CONFIG_MTD_M25P80=m CONFIG_M25PXX_USE_FAST_READ=y # CONFIG_MTD_SST25L is not set @@ -670,10 +669,8 @@ CONFIG_MISC_DEVICES=y # CONFIG_DS1682 is not set # CONFIG_TI_DAC7512 is not set CONFIG_MXS_PERSISTENT=y -# CONFIG_ANDROID_PMEM is not set -# CONFIG_UID_STAT is not set -# CONFIG_C2PORT is not set CONFIG_MXS_PERFMON=y +# CONFIG_C2PORT is not set # # EEPROM support @@ -781,6 +778,7 @@ CONFIG_MII=y # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set CONFIG_FEC=y +# CONFIG_FEC_NAPI is not set # CONFIG_FEC_1588 is not set # CONFIG_FEC2 is not set # CONFIG_NETDEV_1000 is not set @@ -788,17 +786,6 @@ CONFIG_FEC=y CONFIG_WLAN=y # CONFIG_USB_ZD1201 is not set # CONFIG_HOSTAP is not set -CONFIG_ATH6K_LEGACY=m -CONFIG_AR600x_SD31_XXX=y -# CONFIG_AR600x_WB31_XXX is not set -# CONFIG_AR600x_SD32_XXX is not set -# CONFIG_AR600x_CUSTOM_XXX is not set -# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set -# CONFIG_ATH6KL_HCI_BRIDGE is not set -# CONFIG_ATH6KL_CFG80211 is not set -# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set -# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set -# CONFIG_ATH6KL_DEBUG is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -861,6 +848,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_KEYBOARD_MXS=y +# CONFIG_KEYBOARD_MPR121 is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y @@ -908,6 +896,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set CONFIG_TOUCHSCREEN_GUNZE=m # CONFIG_TOUCHSCREEN_ELO is not set @@ -925,6 +914,8 @@ CONFIG_TOUCHSCREEN_MXS=y # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_P1003 is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATI_REMOTE is not set @@ -936,6 +927,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ISL29023 is not set # # Hardware I/O ports @@ -1159,6 +1151,7 @@ CONFIG_MFD_SUPPORT=y # CONFIG_MFD_LTC3589_I2C is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set +# CONFIG_PMIC_DA9052 is not set # CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set # CONFIG_AB8500_CORE is not set @@ -1597,7 +1590,6 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_GOKU is not set CONFIG_USB_GADGET_ARC=y CONFIG_USB_ARC=y -CONFIG_WORKAROUND_ARCUSB_REG_RW=y # CONFIG_USB_GADGET_LANGWELL is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y @@ -1744,7 +1736,45 @@ CONFIG_DMADEVICES=y # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set CONFIG_STAGING=y -CONFIG_STAGING_EXCLUDE_BUILD=n +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_VIDEO_TM6000 is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_RT2870 is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_TRANZPORT is not set +# CONFIG_POHMELFS is not set +# CONFIG_LINE6_USB is not set +# CONFIG_VT6656 is not set +# CONFIG_FB_UDL is not set + +# +# RAR Register Driver +# +# CONFIG_IIO is not set +# CONFIG_RAMZSWAP is not set +# CONFIG_BATMAN_ADV is not set +# CONFIG_FB_SM7XX is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# CONFIG_ADIS16255 is not set +CONFIG_ATH6K_LEGACY=m +CONFIG_AR600x_SD31_XXX=y +# CONFIG_AR600x_WB31_XXX is not set +# CONFIG_AR600x_SD32_XXX is not set +# CONFIG_AR600x_CUSTOM_XXX is not set +# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set +# CONFIG_ATH6KL_HCI_BRIDGE is not set +# CONFIG_ATH6KL_CFG80211 is not set +# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set +# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set +# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set +# CONFIG_ATH6KL_DEBUG is not set # # File systems @@ -1865,13 +1895,15 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CEPH_FS is not set diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig index c2a11cb5..f0dd04dc 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.3 -# Tue Sep 11 14:37:32 2012 +# Tue Jul 2 16:23:28 2013 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -522,6 +522,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set CONFIG_CAN=y CONFIG_CAN_RAW=y @@ -874,6 +875,7 @@ CONFIG_SMSC911X=y # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set CONFIG_FEC=y +# CONFIG_FEC_NAPI is not set # CONFIG_FEC_1588 is not set # CONFIG_FEC2 is not set # CONFIG_NETDEV_1000 is not set