From 2d5a01974e233354108eccfcb8a97507d3a33dc4 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Wed, 23 Jan 2013 12:59:55 +0100 Subject: [PATCH] meta-digi-arm: Add kernel defconfigs for merged wireless and non wireless. These new defconfigs are needed after merging the wireless and non wireless products in the linux kernel source. Signed-off-by: Alex Gonzalez --- .../linux-imx_2.6.35.3/ccardxmx28js/defconfig | 8 +++---- .../linux-imx_2.6.35.3/ccxmx51js/defconfig | 24 ++++++++----------- .../linux-imx_2.6.35.3/ccxmx53js/defconfig | 14 +++++------ 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig index 1522a4cf6..37c311cc2 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig @@ -243,14 +243,12 @@ CONFIG_ARCH_MX28=y CONFIG_MODULE_CCARDXMX28=y # CONFIG_MACH_MX28EVK is not set # CONFIG_MACH_CPX2 is not set -CONFIG_MACH_CCARDWMX28JS=y -# CONFIG_MACH_CCARDMX28JS is not set -# CONFIG_MACH_CCARDWMX28 is not set -# CONFIG_MACH_CCARDMX28 is not set +CONFIG_MACH_CCARDXMX28JS=y +# CONFIG_MACH_CCARDXMX28 is not set # CONFIG_MACH_WR21 is not set CONFIG_CCARDXMX28_AUTODETECT_MODULE=y # CONFIG_JSCCARDXMX28_V1 is not set -CONFIG_JSCCARDXMX28_V2V3=y +CONFIG_JSCCARDXMX28_VX=y # CONFIG_JSCCARDXMX28_CUSTOM is not set CONFIG_MTD_DIGI_REMOVE_DEFAULT_FREESCALE_PARTITION=y CONFIG_NO_OTP_MAC_ADDRESS=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig index 366a78659..40b3c35b7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig @@ -252,24 +252,20 @@ CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_MODULE_CCXMX5X=y CONFIG_MODULE_CCXMX51=y CONFIG_LATE_CPU_CLK_ENABLE=y -CONFIG_MACH_CCWMX51JS=y -# CONFIG_MACH_CCWMX51 is not set -# CONFIG_MACH_CCMX51JS is not set -# CONFIG_MACH_CCMX51 is not set -# CONFIG_JSCCWMX51_V1 is not set -CONFIG_JSCCWMX51_V2=y -# CONFIG_JSCCWMX51_CUSTOM is not set +CONFIG_MACH_CCXMX51JS=y +# CONFIG_MACH_CCXMX51 is not set +# CONFIG_JSCCXMX51_V1 is not set +CONFIG_JSCCXMX51_V2=y +# CONFIG_JSCCXMX51_CUSTOM is not set # CONFIG_MACH_MX53_EVK is not set # CONFIG_MACH_MX53_ARD is not set # CONFIG_MACH_MX53_SMD is not set # CONFIG_MACH_MX53_LOCO is not set -# CONFIG_MACH_CCWMX53JS is not set -# CONFIG_MACH_CCWMX53 is not set -# CONFIG_MACH_CCMX53JS is not set -# CONFIG_MACH_CCMX53 is not set +# CONFIG_MACH_CCXMX53JS is not set +# CONFIG_MACH_CCXMX53 is not set # CONFIG_CERTMX53_V1 is not set -# CONFIG_JSCCWMX53_V2 is not set -# CONFIG_JSCCWMX53_CUSTOM is not set +# CONFIG_JSCCXMX53_V2 is not set +# CONFIG_JSCCXMX53_CUSTOM is not set # CONFIG_MACH_MX50_ARM2 is not set # CONFIG_MACH_MX50_RDP is not set @@ -1365,7 +1361,7 @@ CONFIG_SND_MXC_SOC_SSI=y # CONFIG_SND_SOC_IMX_CCXMX53_SGTL5000 is not set # CONFIG_SND_SOC_IMX_3STACK_AK4647 is not set # CONFIG_SND_SOC_IMX_3STACK_WM8580 is not set -CONFIG_SND_SOC_IMX_CCWMX51_WM8753=y +# CONFIG_SND_SOC_IMX_CCXMX51_WM8753 is not set # CONFIG_SND_SOC_IMX_3STACK_AK5702 is not set # CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set # CONFIG_SND_SOC_IMX_3STACK_CS42888 is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig index 498abb0b7..b6e9ad181 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig @@ -263,13 +263,11 @@ CONFIG_MODULE_CCXMX5X=y # CONFIG_MACH_MX53_LOCO is not set CONFIG_I2C_IMX_RECOVER_FROM_STUCK=y CONFIG_MODULE_CCXMX53=y -CONFIG_MACH_CCWMX53JS=y -# CONFIG_MACH_CCWMX53 is not set -# CONFIG_MACH_CCMX53JS is not set -# CONFIG_MACH_CCMX53 is not set +CONFIG_MACH_CCXMX53JS=y +# CONFIG_MACH_CCXMX53 is not set # CONFIG_CERTMX53_V1 is not set -CONFIG_JSCCWMX53_V2=y -# CONFIG_JSCCWMX53_CUSTOM is not set +CONFIG_JSCCXMX53_V2=y +# CONFIG_JSCCXMX53_CUSTOM is not set # CONFIG_MACH_MX50_ARM2 is not set # CONFIG_MACH_MX50_RDP is not set @@ -352,8 +350,8 @@ CONFIG_CONFIG_MXC_I2C3_FAST=y # # CAN Port Options # -CONFIG_CCWMX53_CAN1=y -CONFIG_CCWMX53_CAN2=y +CONFIG_CCXMX53_CAN1=y +CONFIG_CCXMX53_CAN2=y # # SD/MMC Interface options