summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-06-08 14:49:29 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-06-08 14:49:29 +0100
commit2e3ed492cffca645fddaf1ffc98337b0be08aea6 (patch)
treeca375c65b4c1e7312e82e541e76170307a340cde /config-arm-generic
parent3d3e17409cacdbadf082f7a6959642291737b268 (diff)
downloadkernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.tar.gz
kernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.tar.xz
kernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.zip
Minor ARM/aarch64 config updates
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic5
1 files changed, 3 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 6995e1e70..eae9b5087 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -57,7 +57,6 @@ CONFIG_ARM_GIC=y
CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3=y
CONFIG_ARM_GIC_V3_ITS=y
-# CONFIG_HISILICON_IRQ_MBIGEN is not set
CONFIG_ARM_GLOBAL_TIMER=y
CONFIG_ARM_SMMU=y
CONFIG_MMC_ARMMMCI=y
@@ -70,6 +69,8 @@ CONFIG_PL330_DMA=m
CONFIG_GPIO_PL061=y
CONFIG_USB_ISP1760=m
CONFIG_ARM_PL172_MPMC=m
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
# HW crypto and rng
CONFIG_ARM_CRYPTO=y
@@ -588,7 +589,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
# drm
# CONFIG_DRM_VMWGFX is not set
-# CONFIG_DRM_HDLCD is not set
# CONFIG_IMX_IPUV3_CORE is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set
@@ -607,6 +607,7 @@ CONFIG_CHECKPOINT_RESTORE=y
# CONFIG_PINCTRL_SUNRISEPOINT is not set
# CONFIG_HW_RANDOM_HISI is not set
+# CONFIG_HISILICON_IRQ_MBIGEN is not set
# CONFIG_QRTR is not set
# This Xilinx option is now built for arm64 as well as ARM