From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 3 Jul 2013 13:22:51 +0000 (-0300)
Subject: linux-imx (3.0.35): Sync i.MX6 defconfig files
X-Git-Tag: 2.1~1324
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=15de919023994a11b58f66832d8c0b6751bc401d;p=meta-freescale.git

linux-imx (3.0.35): Sync i.MX6 defconfig files

This runs each defconfig against 'savedefconfig' and also sync i.MX6SL
to i.MX6Q one.

Change-Id: I85b8e973df695154d816e313589512a1118d306d
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig
index 7193921b..2d1ac2e5 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig
@@ -19,6 +19,7 @@ CONFIG_MACH_MX6Q_ARM2=y
 CONFIG_MACH_MX6Q_SABRELITE=y
 CONFIG_MACH_MX6Q_SABRESD=y
 CONFIG_MACH_MX6Q_SABREAUTO=y
+CONFIG_MACH_MX6Q_HDMIDONGLE=y
 CONFIG_USB_EHCI_ARC_H1=y
 CONFIG_USB_FSL_ARC_OTG=y
 CONFIG_MXC_PWM=y
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig
index 7193921b..2d1ac2e5 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig
@@ -19,6 +19,7 @@ CONFIG_MACH_MX6Q_ARM2=y
 CONFIG_MACH_MX6Q_SABRELITE=y
 CONFIG_MACH_MX6Q_SABRESD=y
 CONFIG_MACH_MX6Q_SABREAUTO=y
+CONFIG_MACH_MX6Q_HDMIDONGLE=y
 CONFIG_USB_EHCI_ARC_H1=y
 CONFIG_USB_FSL_ARC_OTG=y
 CONFIG_MXC_PWM=y
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig
index 5bb96662..db3069f5 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_MODULES=y
@@ -61,6 +62,8 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_LLC2=y
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
 CONFIG_CAN_BCM=y