From: Martin Blumenstingl Date: Sun, 20 May 2018 17:23:53 +0000 (+0200) Subject: ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8 X-Git-Tag: android-x86-8.1-r1~875^2~16^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae0257da5701b6e44eba9dc4ebab867b56d6ea29;p=android-x86%2Fkernel.git ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8 Currently there are no differences between the MACH_MESON8 and MACH_MESON8B Kconfig symbols (except the help text). Since both platforms are very similar (Meson8b being a slightly updated, cost-reduced version of Meson8 which even shares some peripherals with Meson8m2) no notable differences are expected in the future either. Suggested-by: Kevin Hilman Signed-off-by: Martin Blumenstingl Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 2bc630471beb..d51cfda953d4 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -19,14 +19,7 @@ config MACH_MESON6 select MESON6_TIMER config MACH_MESON8 - bool "Amlogic Meson8 and Meson8m2 SoCs support" - default ARCH_MESON - select MESON6_TIMER - select COMMON_CLK_MESON8B - select MESON_IRQ_GPIO - -config MACH_MESON8B - bool "Amlogic Meson8b SoCs support" + bool "Amlogic Meson8, Meson8b and Meson8m2 SoCs support" default ARCH_MESON select MESON6_TIMER select COMMON_CLK_MESON8B