summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRobin Gong <B38343@freescale.com>2011-10-31 09:55:25 +0800
committerRobin Gong <B38343@freescale.com>2011-10-31 16:30:18 +0800
commit447bb0c758a61a4d32823ac3f221beb1ce485a34 (patch)
tree96a8db314b6774f15b2db1faabee850cfb04a8b3 /arch/arm/configs
parentf0e15a01af31a585922148bfcbc7325d11154b55 (diff)
ENGR00157253-1 MX6Q spi: add ecspi for MX6Q
1.modify config 2.add board level support ecspi 3.add ecspi pad configure Signed-off-by: Robin Gong <B38343@freescale.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx6_defconfig11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 4944c006de31..679b85710d5a 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38 Kernel Configuration
-# Sat Oct 8 10:55:25 2011
+# Wed Oct 26 15:45:36 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -691,7 +691,8 @@ CONFIG_MTD_CFI_I2=y
# Self-contained MTD device drivers
#
# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_M25P80=y
+CONFIG_M25PXX_USE_FAST_READ=y
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
@@ -1079,9 +1080,10 @@ CONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
-# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_IMX is not set
+CONFIG_SPI_IMX_VER_2_3=y
+CONFIG_SPI_IMX=y
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
@@ -1150,7 +1152,6 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_MPCORE_WATCHDOG is not set
# CONFIG_MAX63XX_WATCHDOG is not set
CONFIG_IMX2_WDT=y