diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-07-03 10:22:51 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-07-10 09:01:53 -0300 |
commit | 6303792e4b67557583e1490a692fbbb46c0c3e99 (patch) | |
tree | e766a229dd2a837d06cf3a1d900b212b1b52e6bd | |
parent | 504ead39a392d5f52b7979106d70b61130e42b4e (diff) | |
download | meta-fsl-arm-6303792e4b67557583e1490a692fbbb46c0c3e99.tar.gz |
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>
-rw-r--r-- | recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig index 7193921..2d1ac2e 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig +++ b/recipes-kernel/linux/linux-imx-3.0.35/mx6dl/defconfig | |||
@@ -19,6 +19,7 @@ CONFIG_MACH_MX6Q_ARM2=y | |||
19 | CONFIG_MACH_MX6Q_SABRELITE=y | 19 | CONFIG_MACH_MX6Q_SABRELITE=y |
20 | CONFIG_MACH_MX6Q_SABRESD=y | 20 | CONFIG_MACH_MX6Q_SABRESD=y |
21 | CONFIG_MACH_MX6Q_SABREAUTO=y | 21 | CONFIG_MACH_MX6Q_SABREAUTO=y |
22 | CONFIG_MACH_MX6Q_HDMIDONGLE=y | ||
22 | CONFIG_USB_EHCI_ARC_H1=y | 23 | CONFIG_USB_EHCI_ARC_H1=y |
23 | CONFIG_USB_FSL_ARC_OTG=y | 24 | CONFIG_USB_FSL_ARC_OTG=y |
24 | CONFIG_MXC_PWM=y | 25 | CONFIG_MXC_PWM=y |
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig index 7193921..2d1ac2e 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig +++ b/recipes-kernel/linux/linux-imx-3.0.35/mx6q/defconfig | |||
@@ -19,6 +19,7 @@ CONFIG_MACH_MX6Q_ARM2=y | |||
19 | CONFIG_MACH_MX6Q_SABRELITE=y | 19 | CONFIG_MACH_MX6Q_SABRELITE=y |
20 | CONFIG_MACH_MX6Q_SABRESD=y | 20 | CONFIG_MACH_MX6Q_SABRESD=y |
21 | CONFIG_MACH_MX6Q_SABREAUTO=y | 21 | CONFIG_MACH_MX6Q_SABREAUTO=y |
22 | CONFIG_MACH_MX6Q_HDMIDONGLE=y | ||
22 | CONFIG_USB_EHCI_ARC_H1=y | 23 | CONFIG_USB_EHCI_ARC_H1=y |
23 | CONFIG_USB_FSL_ARC_OTG=y | 24 | CONFIG_USB_FSL_ARC_OTG=y |
24 | CONFIG_MXC_PWM=y | 25 | CONFIG_MXC_PWM=y |
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig index 5bb9666..db3069f 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig +++ b/recipes-kernel/linux/linux-imx-3.0.35/mx6sl/defconfig | |||
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y | |||
4 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
5 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_LOG_BUF_SHIFT=14 |
7 | CONFIG_CGROUPS=y | ||
7 | CONFIG_EMBEDDED=y | 8 | CONFIG_EMBEDDED=y |
8 | CONFIG_PERF_EVENTS=y | 9 | CONFIG_PERF_EVENTS=y |
9 | CONFIG_MODULES=y | 10 | CONFIG_MODULES=y |
@@ -61,6 +62,8 @@ CONFIG_IP_PNP_DHCP=y | |||
61 | CONFIG_IP_PNP_BOOTP=y | 62 | CONFIG_IP_PNP_BOOTP=y |
62 | # CONFIG_INET_LRO is not set | 63 | # CONFIG_INET_LRO is not set |
63 | # CONFIG_IPV6 is not set | 64 | # CONFIG_IPV6 is not set |
65 | CONFIG_NETFILTER=y | ||
66 | CONFIG_LLC2=y | ||
64 | CONFIG_CAN=y | 67 | CONFIG_CAN=y |
65 | CONFIG_CAN_RAW=y | 68 | CONFIG_CAN_RAW=y |
66 | CONFIG_CAN_BCM=y | 69 | CONFIG_CAN_BCM=y |