Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f628e3d9 authored Feb 12, 2013 by Olof Johansson

Merge tag 'arm-imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

ARM i.MX defconfig updates for v3.9

- enable VPU support in imx_v4_v5_defconfig to get compile coverage
- enable netfilter support

* tag 'arm-imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6

:
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 2cb6a070 09de7ee1

arch/arm/configs/imx_v4_v5_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ CONFIG_IP_PNP_DHCP=y
		# CONFIG_INET_LRO is not set
		# CONFIG_INET_DIAG is not set
		# CONFIG_IPV6 is not set
		CONFIG_NETFILTER=y
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		@@ -127,6 +128,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
		CONFIG_SOC_CAMERA=y
		CONFIG_SOC_CAMERA_OV2640=y
		CONFIG_VIDEO_MX2=y
		CONFIG_V4L_MEM2MEM_DRIVERS=y
		CONFIG_VIDEO_CODA=y
		CONFIG_FB=y
		CONFIG_FB_IMX=y
		CONFIG_BACKLIGHT_LCD_SUPPORT=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ CONFIG_IP_PNP_DHCP=y
		# CONFIG_INET_XFRM_MODE_BEET is not set
		# CONFIG_INET_LRO is not set
		CONFIG_IPV6=y
		CONFIG_NETFILTER=y
		# CONFIG_WIRELESS is not set
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y