1 files changed, 8 insertions, 32 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index db30b0dff..6cf55ccfb 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -205,7 +205,7 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_KEYSTONE is not set
 # CONFIG_ARCH_MDM9615 is not set
 # CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
+CONFIG_ARCH_MESON=y
 CONFIG_ARCH_MMP=y
 CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
@@ -230,7 +230,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_TEGRA_186_SOC is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA=y
@@ -499,7 +498,6 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 CONFIG_BATTERY_RX51=m
@@ -1333,14 +1331,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_LDB=m
@@ -1351,7 +1341,7 @@ CONFIG_DRM_IMX_TVE=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
-# CONFIG_DRM_MESON is not set
+CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MSM_DSI is not set
@@ -1397,7 +1387,7 @@ CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_SIS is not set
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
 CONFIG_DRM_SUN4I=m
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -1413,8 +1403,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1509,7 +1497,7 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
-# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_STI=m
@@ -1634,7 +1622,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
 CONFIG_FB_ARMCLCD=y
 # CONFIG_FB_ASILIANT is not set
@@ -1652,19 +1639,12 @@ CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_FB_DA8XX is not set
 CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
 # CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
 # CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -1711,9 +1691,6 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
@@ -2177,8 +2154,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2373,7 +2348,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -2963,6 +2937,9 @@ CONFIG_MACH_ARMADA_XP=y
 CONFIG_MACH_DOVE=y
 # CONFIG_MACH_FLINT is not set
 # CONFIG_MACH_MARVELL_JASPER is not set
+# CONFIG_MACH_MESON6 is not set
+CONFIG_MACH_MESON8B=y
+# CONFIG_MACH_MESON8 is not set
 CONFIG_MACH_MMP2_DT=y
 # CONFIG_MACH_OMAP3517EVM is not set
 # CONFIG_MACH_OMAP3_PANDORA is not set
@@ -3074,6 +3051,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@@ -6719,8 +6697,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m