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 <khilman@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 2bc6304..d51cfda 100644 (file)
--- 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