From d7144a5d3742bfdf3518407948b9bf233c1686d9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 3 Apr 2017 20:29:35 +0100 Subject: [PATCH] Update Amlogic meson support --- baseconfig/CONFIG_ARCH_TEGRA_186_SOC | 1 - baseconfig/CONFIG_I2C_IMX_LPI2C | 1 - baseconfig/CONFIG_MESON_GXL_PHY | 1 - baseconfig/arm/{arm64 => }/CONFIG_DRM_MESON | 0 baseconfig/arm/CONFIG_MESON_SARADC | 1 + baseconfig/arm/CONFIG_MESON_SM | 2 +- baseconfig/arm/arm64/CONFIG_ARCH_MESON | 1 - baseconfig/{ => arm/arm64}/CONFIG_TEGRA_IVC | 0 baseconfig/arm/armv7/CONFIG_ARCH_MESON | 1 - baseconfig/arm/armv7/CONFIG_DRM_MESON | 1 - baseconfig/arm/armv7/CONFIG_MACH_MESON6 | 1 + baseconfig/arm/armv7/CONFIG_MACH_MESON8 | 1 + baseconfig/arm/armv7/CONFIG_MACH_MESON8B | 1 + baseconfig/arm/armv7/CONFIG_TEGRA_IVC | 1 + kernel-aarch64-debug.config | 6 +++--- kernel-aarch64.config | 6 +++--- kernel-armv7hl-debug.config | 11 +++++++---- kernel-armv7hl-lpae-debug.config | 12 +++++++----- kernel-armv7hl-lpae.config | 12 +++++++----- kernel-armv7hl.config | 11 +++++++---- kernel-i686-PAE.config | 4 ---- kernel-i686-PAEdebug.config | 4 ---- kernel-i686-debug.config | 4 ---- kernel-i686.config | 4 ---- kernel-ppc64-debug.config | 4 ---- kernel-ppc64.config | 4 ---- kernel-ppc64le-debug.config | 4 ---- kernel-ppc64le.config | 4 ---- kernel-ppc64p7-debug.config | 4 ---- kernel-ppc64p7.config | 4 ---- kernel-s390x-debug.config | 4 ---- kernel-s390x.config | 4 ---- kernel-x86_64-debug.config | 4 ---- kernel-x86_64.config | 4 ---- kernel.spec | 3 +++ 35 files changed, 43 insertions(+), 87 deletions(-) delete mode 100644 baseconfig/CONFIG_ARCH_TEGRA_186_SOC delete mode 100644 baseconfig/CONFIG_I2C_IMX_LPI2C delete mode 100644 baseconfig/CONFIG_MESON_GXL_PHY rename baseconfig/arm/{arm64 => }/CONFIG_DRM_MESON (100%) create mode 100644 baseconfig/arm/CONFIG_MESON_SARADC delete mode 100644 baseconfig/arm/arm64/CONFIG_ARCH_MESON rename baseconfig/{ => arm/arm64}/CONFIG_TEGRA_IVC (100%) delete mode 100644 baseconfig/arm/armv7/CONFIG_ARCH_MESON delete mode 100644 baseconfig/arm/armv7/CONFIG_DRM_MESON create mode 100644 baseconfig/arm/armv7/CONFIG_MACH_MESON6 create mode 100644 baseconfig/arm/armv7/CONFIG_MACH_MESON8 create mode 100644 baseconfig/arm/armv7/CONFIG_MACH_MESON8B create mode 100644 baseconfig/arm/armv7/CONFIG_TEGRA_IVC diff --git a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/CONFIG_ARCH_TEGRA_186_SOC deleted file mode 100644 index 0439db330..000000000 --- a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_TEGRA_186_SOC is not set diff --git a/baseconfig/CONFIG_I2C_IMX_LPI2C b/baseconfig/CONFIG_I2C_IMX_LPI2C deleted file mode 100644 index 2d866d55f..000000000 --- a/baseconfig/CONFIG_I2C_IMX_LPI2C +++ /dev/null @@ -1 +0,0 @@ -CONFIG_I2C_IMX_LPI2C=m diff --git a/baseconfig/CONFIG_MESON_GXL_PHY b/baseconfig/CONFIG_MESON_GXL_PHY deleted file mode 100644 index cc59580cc..000000000 --- a/baseconfig/CONFIG_MESON_GXL_PHY +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MESON_GXL_PHY=m diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MESON b/baseconfig/arm/CONFIG_DRM_MESON similarity index 100% rename from baseconfig/arm/arm64/CONFIG_DRM_MESON rename to baseconfig/arm/CONFIG_DRM_MESON diff --git a/baseconfig/arm/CONFIG_MESON_SARADC b/baseconfig/arm/CONFIG_MESON_SARADC new file mode 100644 index 000000000..cae134290 --- /dev/null +++ b/baseconfig/arm/CONFIG_MESON_SARADC @@ -0,0 +1 @@ +CONFIG_MESON_SARADC=m diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM index e918e3e03..3cd5a9e30 100644 --- a/baseconfig/arm/CONFIG_MESON_SM +++ b/baseconfig/arm/CONFIG_MESON_SM @@ -1 +1 @@ -# CONFIG_MESON_SM is not set +CONFIG_MESON_SM=y diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_MESON b/baseconfig/arm/arm64/CONFIG_ARCH_MESON deleted file mode 100644 index 849319f60..000000000 --- a/baseconfig/arm/arm64/CONFIG_ARCH_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_MESON is not set diff --git a/baseconfig/CONFIG_TEGRA_IVC b/baseconfig/arm/arm64/CONFIG_TEGRA_IVC similarity index 100% rename from baseconfig/CONFIG_TEGRA_IVC rename to baseconfig/arm/arm64/CONFIG_TEGRA_IVC diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MESON b/baseconfig/arm/armv7/CONFIG_ARCH_MESON deleted file mode 100644 index 849319f60..000000000 --- a/baseconfig/arm/armv7/CONFIG_ARCH_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_MESON is not set diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON deleted file mode 100644 index 7a6179102..000000000 --- a/baseconfig/arm/armv7/CONFIG_DRM_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_MESON is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON6 b/baseconfig/arm/armv7/CONFIG_MACH_MESON6 new file mode 100644 index 000000000..aff440cc5 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON6 @@ -0,0 +1 @@ +# CONFIG_MACH_MESON6 is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8 b/baseconfig/arm/armv7/CONFIG_MACH_MESON8 new file mode 100644 index 000000000..e55c72211 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8 @@ -0,0 +1 @@ +# CONFIG_MACH_MESON8 is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B new file mode 100644 index 000000000..5212d2aca --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B @@ -0,0 +1 @@ +CONFIG_MACH_MESON8B=y diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC new file mode 100644 index 000000000..cdcacbec2 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC @@ -0,0 +1 @@ +CONFIG_TEGRA_IVC=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2e45e76d7..4dbc0a011 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -215,7 +215,7 @@ CONFIG_ARCH_HISI=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_MESON is not set +CONFIG_ARCH_MESON=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_QCOM=y # CONFIG_ARCH_RENESAS is not set @@ -1945,7 +1945,6 @@ CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m # CONFIG_I2C_HIX5HD2 is not set # 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 @@ -2832,7 +2831,8 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m -# CONFIG_MESON_SM is not set +CONFIG_MESON_SARADC=m +CONFIG_MESON_SM=y # CONFIG_MESON_WATCHDOG is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 12f1fb7cd..c4890585e 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -215,7 +215,7 @@ CONFIG_ARCH_HISI=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_MESON is not set +CONFIG_ARCH_MESON=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_QCOM=y # CONFIG_ARCH_RENESAS is not set @@ -1928,7 +1928,6 @@ CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m # CONFIG_I2C_HIX5HD2 is not set # 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 @@ -2812,7 +2811,8 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m -# CONFIG_MESON_SM is not set +CONFIG_MESON_SARADC=m +CONFIG_MESON_SM=y # CONFIG_MESON_WATCHDOG is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 2651a8b9a..973ed27a4 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 @@ -1342,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 @@ -2938,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 @@ -3049,7 +3051,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 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 53591551c..4c5aa2b7d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.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 @@ -1285,7 +1284,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 @@ -2000,7 +1999,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 @@ -2811,6 +2809,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 @@ -2916,7 +2917,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 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 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 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 1737ce557..81675eddb 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -1853,7 +1852,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2769,7 +2767,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5094,7 +5091,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 6c49be27d..06ca11920 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1871,7 +1870,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2789,7 +2787,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5116,7 +5113,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d65d9d64b..43fc328b3 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1871,7 +1870,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2789,7 +2787,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5116,7 +5113,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686.config b/kernel-i686.config index 9e63782d5..29efc1162 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -1853,7 +1852,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2769,7 +2767,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5094,7 +5091,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index d7b42b3f4..329b774d0 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -174,7 +174,6 @@ CONFIG_APPLE_AIRPORT=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1760,7 +1759,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2640,7 +2638,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4912,7 +4909,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index f5a331aad..5c8eb4bd3 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -174,7 +174,6 @@ CONFIG_APPLE_AIRPORT=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -1742,7 +1741,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2619,7 +2617,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4888,7 +4885,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 20d6620bc..a3325b58a 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -168,7 +168,6 @@ CONFIG_APM_POWER=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1713,7 +1712,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2586,7 +2584,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4841,7 +4838,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index ccd4e4328..8082b9e96 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -168,7 +168,6 @@ CONFIG_APM_POWER=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -1695,7 +1694,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2565,7 +2563,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4817,7 +4814,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index b8fba01fb..ba21291f0 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -168,7 +168,6 @@ CONFIG_APM_POWER=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1712,7 +1711,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2585,7 +2583,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4840,7 +4837,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 71d2d249e..5b79ac360 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -168,7 +168,6 @@ CONFIG_APM_POWER=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -1694,7 +1693,6 @@ CONFIG_I2C_DIOLAN_U2C=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=m CONFIG_I2C_MLXCPLD=m @@ -2564,7 +2562,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4816,7 +4813,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index aa07540fe..dd43ab707 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -169,7 +169,6 @@ CONFIG_APPLDATA_OS=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1667,7 +1666,6 @@ CONFIG_I2C_DIOLAN_U2C=m # CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_HID is not set # CONFIG_I2C_I801 is not set -CONFIG_I2C_IMX_LPI2C=m # CONFIG_I2C_ISCH is not set CONFIG_I2C=m CONFIG_I2C_MLXCPLD=m @@ -2521,7 +2519,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4730,7 +4727,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 41aec9bdd..c3ebd0184 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -169,7 +169,6 @@ CONFIG_APPLDATA_OS=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -1649,7 +1648,6 @@ CONFIG_I2C_DIOLAN_U2C=m # CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_HID is not set # CONFIG_I2C_I801 is not set -CONFIG_I2C_IMX_LPI2C=m # CONFIG_I2C_ISCH is not set CONFIG_I2C=m CONFIG_I2C_MLXCPLD=m @@ -2500,7 +2498,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -4706,7 +4703,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 8608267ba..46ad08689 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -221,7 +221,6 @@ CONFIG_APPLE_PROPERTIES=y CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m # CONFIG_ARCH_MEMORY_PROBE is not set -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_AS3935 is not set @@ -1897,7 +1896,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2822,7 +2820,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5149,7 +5146,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index a4dafb582..6c769f8c8 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -221,7 +221,6 @@ CONFIG_APPLE_PROPERTIES=y CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m # CONFIG_ARCH_MEMORY_PROBE is not set -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -1879,7 +1878,6 @@ CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HID=m CONFIG_I2C_I801=m -CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m @@ -2802,7 +2800,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -CONFIG_MESON_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5127,7 +5124,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel.spec b/kernel.spec index 458784fb6..ff443cc88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,6 +2169,9 @@ fi # # %changelog +* Mon Apr 3 2017 Peter Robinson +- Update Amlogic meson support + * Mon Apr 03 2017 Laura Abbott - 4.11.0-0.rc5.git0.1 - Linux v4.11-rc5 - Disable 64K pages on aarch64