aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2014-06-19 07:19:44 -0400
committerDong Aisheng <b29396@freescale.com>2014-06-20 02:00:13 -0400
commitaf51180cd6df6117cea5b87602373fa29a7ca557 (patch)
tree177cca1d08c2f3ed447d970c41a15d8a49f939ad
parent4d7797bf66c59204534d8dcf53d632293965debe (diff)
ENGR00319455-4 imx_v7_defconfig: enable canfd by default
enable canfd by default. The defconfig is generated by make ARCH=arm savedefconfig which got the uneeded CONFIG_USB_PHY removed. Signed-off-by: Dong Aisheng <b29396@freescale.com>
-rw-r--r--arch/arm/configs/imx_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 06064d6b59f1..ff1b66c9e1cd 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -64,6 +64,7 @@ CONFIG_VLAN_8021Q=y
64CONFIG_LLC2=y 64CONFIG_LLC2=y
65CONFIG_CAN=y 65CONFIG_CAN=y
66CONFIG_CAN_FLEXCAN=y 66CONFIG_CAN_FLEXCAN=y
67CONFIG_CAN_M_CAN=y
67CONFIG_CFG80211=y 68CONFIG_CFG80211=y
68CONFIG_CFG80211_WEXT=y 69CONFIG_CFG80211_WEXT=y
69CONFIG_MAC80211=y 70CONFIG_MAC80211=y
@@ -252,7 +253,6 @@ CONFIG_USB_STORAGE=y
252CONFIG_USB_CHIPIDEA=y 253CONFIG_USB_CHIPIDEA=y
253CONFIG_USB_CHIPIDEA_UDC=y 254CONFIG_USB_CHIPIDEA_UDC=y
254CONFIG_USB_CHIPIDEA_HOST=y 255CONFIG_USB_CHIPIDEA_HOST=y
255CONFIG_USB_PHY=y
256CONFIG_NOP_USB_XCEIV=y 256CONFIG_NOP_USB_XCEIV=y
257CONFIG_USB_MXS_PHY=y 257CONFIG_USB_MXS_PHY=y
258CONFIG_USB_GADGET=y 258CONFIG_USB_GADGET=y