summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/apalis_imx6_android_defconfig17
1 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/configs/apalis_imx6_android_defconfig b/arch/arm/configs/apalis_imx6_android_defconfig
index a0769007aed2..74b32c18dd33 100644
--- a/arch/arm/configs/apalis_imx6_android_defconfig
+++ b/arch/arm/configs/apalis_imx6_android_defconfig
@@ -329,7 +329,7 @@ CONFIG_HAVE_IMX_SRC=y
#
# CONFIG_SOC_IMX53 is not set
CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
+# CONFIG_SOC_IMX6SL is not set
# CONFIG_SOC_VF610 is not set
# CONFIG_ARCH_OMAP2PLUS is not set
# CONFIG_ARCH_SOCFPGA is not set
@@ -419,8 +419,8 @@ CONFIG_PCIE_DW=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_FORCE_GEN1=y
# CONFIG_EP_MODE_IN_EP_RC_SYS is not set
-CONFIG_RC_MODE_IN_EP_RC_SYS=y
-CONFIG_PCI_IMX_EP_DRV=y
+# CONFIG_RC_MODE_IN_EP_RC_SYS is not set
+# CONFIG_PCI_IMX_EP_DRV is not set
# CONFIG_PCCARD is not set
#
@@ -2074,7 +2074,7 @@ CONFIG_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
CONFIG_PINCTRL_IMX=y
CONFIG_PINCTRL_IMX6Q=y
-CONFIG_PINCTRL_IMX6SL=y
+# CONFIG_PINCTRL_IMX6SL is not set
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_EXYNOS is not set
# CONFIG_PINCTRL_EXYNOS5440 is not set
@@ -3490,6 +3490,15 @@ CONFIG_DMA_OF=y
# CONFIG_VIRT_DRIVERS is not set
#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_VIRT_DRIVERS is not set
+
+#
# Virtio drivers
#
# CONFIG_VIRTIO_PCI is not set