aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig1
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig4
-rw-r--r--arch/arm/configs/mxs_defconfig1
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index e6b0007355f8..5a45d3e6c52b 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -177,6 +177,7 @@ CONFIG_EXT2_FS=y
177CONFIG_EXT3_FS=y 177CONFIG_EXT3_FS=y
178CONFIG_EXT4_FS=y 178CONFIG_EXT4_FS=y
179# CONFIG_DNOTIFY is not set 179# CONFIG_DNOTIFY is not set
180CONFIG_VFAT_FS=y
180# CONFIG_PROC_PAGE_MONITOR is not set 181# CONFIG_PROC_PAGE_MONITOR is not set
181CONFIG_TMPFS=y 182CONFIG_TMPFS=y
182CONFIG_JFFS2_FS=y 183CONFIG_JFFS2_FS=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index cf1e71e2f60a..fdeb1c83dcb5 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -71,6 +71,9 @@ CONFIG_IPV6=y
71CONFIG_NETFILTER=y 71CONFIG_NETFILTER=y
72CONFIG_CAN=y 72CONFIG_CAN=y
73CONFIG_CAN_FLEXCAN=y 73CONFIG_CAN_FLEXCAN=y
74CONFIG_BT=y
75CONFIG_BT_HCIUART=y
76CONFIG_BT_HCIUART_3WIRE=y
74CONFIG_CFG80211=y 77CONFIG_CFG80211=y
75CONFIG_MAC80211=y 78CONFIG_MAC80211=y
76CONFIG_RFKILL=y 79CONFIG_RFKILL=y
@@ -168,6 +171,7 @@ CONFIG_SPI=y
168CONFIG_SPI_IMX=y 171CONFIG_SPI_IMX=y
169CONFIG_GPIO_SYSFS=y 172CONFIG_GPIO_SYSFS=y
170CONFIG_GPIO_MC9S08DZ60=y 173CONFIG_GPIO_MC9S08DZ60=y
174CONFIG_GPIO_PCA953X=y
171CONFIG_GPIO_STMPE=y 175CONFIG_GPIO_STMPE=y
172CONFIG_POWER_SUPPLY=y 176CONFIG_POWER_SUPPLY=y
173CONFIG_POWER_RESET=y 177CONFIG_POWER_RESET=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index c7906c2fd645..b47e7c6628c9 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -149,6 +149,7 @@ CONFIG_EXT4_FS=y
149CONFIG_FSCACHE=m 149CONFIG_FSCACHE=m
150CONFIG_FSCACHE_STATS=y 150CONFIG_FSCACHE_STATS=y
151CONFIG_CACHEFILES=m 151CONFIG_CACHEFILES=m
152CONFIG_VFAT_FS=y
152CONFIG_TMPFS=y 153CONFIG_TMPFS=y
153CONFIG_TMPFS_POSIX_ACL=y 154CONFIG_TMPFS_POSIX_ACL=y
154CONFIG_JFFS2_FS=y 155CONFIG_JFFS2_FS=y