From 31603a3f65cd921dd3889c19243752f8548c3675 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 20 May 2018 19:23:52 +0200 Subject: ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8 Currently there are two identical Kconfig options where only differences are the Kconfig help text and the list of .dtbs that are built: - MACH_MESON8 - MACH_MESON8B Build the Meson8b .dtbs when MACH_MESON8 is selected to get rid of the latter Kconfig symbol later. Suggested-by: Kevin Hilman Signed-off-by: Martin Blumenstingl Signed-off-by: Kevin Hilman --- arch/arm/boot/dts/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4300e86049ee..b7f0b55e0dc5 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -313,14 +313,13 @@ dtb-$(CONFIG_MACH_MESON6) += \ meson6-atv1200.dtb dtb-$(CONFIG_MACH_MESON8) += \ meson8-minix-neo-x8.dtb \ + meson8b-mxq.dtb \ + meson8b-odroidc1.dtb \ meson8m2-mxiii-plus.dtb dtb-$(CONFIG_ARCH_MMP) += \ pxa168-aspenite.dtb \ pxa910-dkb.dtb \ mmp2-brownstone.dtb -dtb-$(CONFIG_MACH_MESON8B) += \ - meson8b-mxq.dtb \ - meson8b-odroidc1.dtb dtb-$(CONFIG_ARCH_MPS2) += \ mps2-an385.dtb \ mps2-an399.dtb -- cgit v1.2.3 From ae0257da5701b6e44eba9dc4ebab867b56d6ea29 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 20 May 2018 19:23:53 +0200 Subject: 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 --- arch/arm/mach-meson/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 -- cgit v1.2.3