From fdc383316795ae890ce932d162ba29c2f85a9c1a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 2 Dec 2013 18:10:50 +0100 Subject: [PATCH] meta-digi-arm: refresh defconfig files for kernel 2.6.35.14 Signed-off-by: Javier Viguera --- .../linux-dey-2.6.35.14/ccardimx28js/defconfig | 17 ++++++----------- .../linux-dey-2.6.35.14/ccimx51js/defconfig | 7 +++---- .../linux-dey-2.6.35.14/ccimx53js/defconfig | 5 +++-- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccardimx28js/defconfig index 3a7dfa172..1c4b1fa4c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccardimx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccardimx28js/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.14 -# Wed May 30 12:30:31 2012 +# Mon Dec 2 18:03:08 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -247,8 +247,6 @@ CONFIG_MACH_CCARDIMX28JS=y # CONFIG_MACH_CCARDIMX28 is not set # CONFIG_MACH_WR21 is not set CONFIG_CCARDIMX28_AUTODETECT_MODULE=y -# CONFIG_CCARDIMX28_V1 is not set -# CONFIG_CCARDIMX28_VX is not set # CONFIG_JSCCARDIMX28_V1 is not set CONFIG_JSCCARDIMX28_VX=y # CONFIG_JSCCARDIMX28_CUSTOM is not set @@ -269,14 +267,14 @@ CONFIG_CCMX28_CAN1=y # Ethernet Options # # CONFIG_CCARDIMX28_ENET0_LEDS is not set -# CONFIG_CCARDIMX28_ENET1_LEDS is not set +# CONFIG_CCARDIMX28_ENET1 is not set # # SPI options # # CONFIG_CCARDIMX28_SPI_SSP1_ENABLE is not set CONFIG_CCARDIMX28_SPI_SSP3_ENABLE=y - +CONFIG_CCARDIMX28_DISP_DATABUS_WIDTH=24 CONFIG_DMA_ZONE=y CONFIG_MXS_CONSISTENT_DMA_SIZE=32 CONFIG_MXS_ICOLL=y @@ -291,8 +289,6 @@ CONFIG_MXS_PWM_CHANNELS=8 CONFIG_MXS_AUART_DMA_SUPPORT=y CONFIG_MXS_AUART_PORTS=5 # CONFIG_MXS_AUART1_DEVICE_ENABLE is not set -# CONFIG_MXS_AUART1_2WIRE is not set -# CONFIG_MXS_AUART1_4WIRE is not set CONFIG_MXS_AUART2_DEVICE_ENABLE=y CONFIG_MXS_AUART2_2WIRE=y # CONFIG_MXS_AUART2_4WIRE is not set @@ -822,7 +818,6 @@ CONFIG_FEC=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -# CONFIG_USB_HSO is not set # CONFIG_USB_IPHETH is not set # CONFIG_WAN is not set # CONFIG_PPP is not set @@ -1012,6 +1007,7 @@ CONFIG_W1=y # 1-wire Bus Masters # # CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set # CONFIG_W1_MASTER_DS1WM is not set # CONFIG_W1_MASTER_GPIO is not set @@ -1020,6 +1016,7 @@ CONFIG_W1=y # # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2431 is not set # CONFIG_W1_SLAVE_DS2751 is not set # CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2438 is not set @@ -1115,7 +1112,6 @@ CONFIG_USB_HID=y # CONFIG_HID_TWINHAN is not set # CONFIG_HID_KENSINGTON is not set # CONFIG_HID_LOGITECH is not set -# CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MICROSOFT is not set # CONFIG_HID_MOSART is not set # CONFIG_HID_MONTEREY is not set @@ -1135,7 +1131,6 @@ CONFIG_USB_HID=y # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TOPSEED is not set # CONFIG_HID_THRUSTMASTER is not set -# CONFIG_HID_WACOM is not set # CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZYDACRON is not set CONFIG_USB_SUPPORT=y @@ -1327,7 +1322,6 @@ CONFIG_MMC_MXS_SSP0_ENABLE=y # CONFIG_MMC_MXS_SSP0_1_DATA_BITS is not set CONFIG_MMC_MXS_SSP0_4_DATA_BITS=y CONFIG_MMC_MXS_SSP0_DATA_BITS=4 -CONFIG_MMC_MXS_SSP2_ENABLE=y # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set @@ -1628,6 +1622,7 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set CONFIG_CRYPTO_WORKQUEUE=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/defconfig index 1cdeebb5d..4f5af8084 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.14 -# Wed May 30 12:33:57 2012 +# Mon Dec 2 17:51:20 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -321,8 +321,6 @@ CONFIG_SPI_MXC_SELECT1_SS1=y # # I2C Interface options # -# CONFIG_CONFIG_MXC_I2C1_STANDARD is not set -CONFIG_CONFIG_MXC_I2C1_FAST=y CONFIG_I2C_MX_SELECT2=y # CONFIG_CONFIG_MXC_I2C2_STANDARD is not set CONFIG_CONFIG_MXC_I2C2_FAST=y @@ -334,6 +332,7 @@ CONFIG_CONFIG_MXC_I2C3_FAST=y # SD/MMC Interface options # CONFIG_ESDHCI_MXC_SELECT1=y +CONFIG_ESDHCI_MXC_SELECT2=y CONFIG_ESDHCI_MXC_SELECT3=y # @@ -846,7 +845,6 @@ CONFIG_FEC=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -# CONFIG_USB_HSO is not set # CONFIG_USB_IPHETH is not set # CONFIG_WAN is not set # CONFIG_PPP is not set @@ -1993,6 +1991,7 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set CONFIG_CRYPTO_WORKQUEUE=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/defconfig index 13c55340f..a8d24ce0b 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.14 -# Wed May 30 12:34:30 2012 +# Mon Dec 2 17:35:51 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -353,6 +353,7 @@ CONFIG_CCIMX53_CAN2=y # # SD/MMC Interface options # +CONFIG_ESDHCI_MXC_SELECT1=y CONFIG_ESDHCI_MXC_SELECT2=y CONFIG_ESDHCI_MXC_SELECT3=y @@ -875,7 +876,6 @@ CONFIG_FEC=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -# CONFIG_USB_HSO is not set # CONFIG_USB_IPHETH is not set # CONFIG_WAN is not set # CONFIG_PPP is not set @@ -2136,6 +2136,7 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set CONFIG_CRYPTO_WORKQUEUE=y