summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-lpae.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-04-03 20:29:35 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-04-03 20:29:35 +0100
commitd7144a5d3742bfdf3518407948b9bf233c1686d9 (patch)
treef474cf7cb4f8685b8fc41bb18dbff4accdb0a655 /kernel-armv7hl-lpae.config
parenta849475f74fba189a9097211761507e790260a12 (diff)
downloadkernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.tar.gz
kernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.tar.xz
kernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.zip
Update Amlogic meson support
Diffstat (limited to 'kernel-armv7hl-lpae.config')
-rw-r--r--kernel-armv7hl-lpae.config12
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6db332c31..09b617d19 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -200,7 +200,7 @@ CONFIG_ARCH_HIGHBANK=y
# CONFIG_ARCH_HISI is not set
CONFIG_ARCH_KEYSTONE=y
# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
+CONFIG_ARCH_MESON=y
# CONFIG_ARCH_MMP is not set
# CONFIG_ARCH_MULTI_V6 is not set
CONFIG_ARCH_MULTI_V7=y
@@ -221,7 +221,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 is not set
# CONFIG_ARCH_TEGRA_3x_SOC is not set
CONFIG_ARCH_TEGRA=y
@@ -1275,7 +1274,7 @@ CONFIG_DRM_I2C_SIL164=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_MXSFB=m
@@ -1983,7 +1982,6 @@ CONFIG_I2C_GPIO=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
-CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
@@ -2792,6 +2790,9 @@ CONFIG_MACH_ARMADA_38X=y
CONFIG_MACH_ARMADA_39X=y
CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
+# CONFIG_MACH_MESON6 is not set
+CONFIG_MACH_MESON8B=y
+# CONFIG_MACH_MESON8 is not set
# CONFIG_MACH_SUN4I is not set
# CONFIG_MACH_SUN5I is not set
CONFIG_MACH_SUN6I=y
@@ -2896,7 +2897,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 is not set