summaryrefslogtreecommitdiffstats
path: root/config-arm-imx
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
committerPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
commit4ee438e84aa8bee5a65d27076ef3436e1337a0e2 (patch)
tree46f9c27a8c20187b8b1ea1a4b60e1847bd3eff10 /config-arm-imx
parent48d35dba7a308ba6c6d97d99f7a3bd62b2d8cead (diff)
downloadkernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.gz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.xz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.zip
Update ARM config options for 3.5, Enable MTD/UBI/JFFS2 on ARM platforms
Diffstat (limited to 'config-arm-imx')
-rw-r--r--config-arm-imx6
1 files changed, 3 insertions, 3 deletions
diff --git a/config-arm-imx b/config-arm-imx
index 9e7191159..6ee58278f 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -13,6 +13,7 @@ CONFIG_MACH_MX51_EFIKASB=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_CPU_FREQ_IMX=y
CONFIG_W1_MASTER_MXC=m
+CONFIG_IMX_DMA=y
CONFIG_IMX_SDMA=y
CONFIG_MACH_MX31ADS=y
CONFIG_MACH_MX31LILLY=y
@@ -40,8 +41,6 @@ CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
CONFIG_ARM_ERRATA_364296=y
CONFIG_PATA_IMX=m
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_NET_VENDOR_FREESCALE=y
CONFIG_FEC=y
CONFIG_KEYBOARD_IMX=m
@@ -50,6 +49,7 @@ CONFIG_HW_RANDOM_MXC_RNGA=m
CONFIG_I2C_IMX=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_MC9S08DZ60=y
CONFIG_DVB_TDA1004X=m
CONFIG_DVB_PLL=m
CONFIG_SND_IMX_SOC=m
@@ -65,6 +65,7 @@ CONFIG_LEDS_PWM=m
CONFIG_MACH_PCM037_EET=y
# CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set
CONFIG_MXC_USE_EPIT=y
+CONFIG_HAVE_EPIT=y
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ERRATA_430973=y
CONFIG_ARM_ERRATA_458693=y
@@ -85,4 +86,3 @@ CONFIG_LEDS_RENESAS_TPU=y
# CONFIG_ARM_LPAE is not set
# CONFIG_INPUT_GP2A is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-