summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.config
diff options
context:
space:
mode:
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r--kernel-armv7hl.config11
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 69d2e09d6..145b4fcb4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.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
@@ -1332,7 +1331,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
@@ -2919,6 +2918,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
@@ -3029,7 +3031,8 @@ 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_SM is not set
+CONFIG_MESON_SARADC=m
+CONFIG_MESON_SM=y
CONFIG_MESON_WATCHDOG=m
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_88PM800=m