MIPS: ath79: Remove the builtin DTB support

Now that appended DTB is usable we can drop the builtin DTB support.

Signed-off-by: Alban Bedel <albeu@free.fr>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12231/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 13c04cf54afac93bd2c0d8fdaa852ecd9911055e..dfc60209dc63ca231a687175a9e9545c1cd9833a 100644 (file)
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -71,18 +71,6 @@ config ATH79_MACH_UBNT_XM
          Say 'Y' here if you want your kernel to support the
          Ubiquiti Networks XM (rev 1.0) board.
 
-choice
-       prompt "Build a DTB in the kernel"
-       optional
-       help
-         Select a devicetree that should be built into the kernel.
-
-       config DTB_TL_WR1043ND_V1
-               bool "TL-WR1043ND Version 1"
-               select BUILTIN_DTB
-               select SOC_AR913X
-endchoice
-
 endmenu
 
 config SOC_AR71XX

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 0e60b0f4c69f377662bd7ca0399c0c118c09600f..906ddace159a9a691a7c15a3de3b52161c1580c8 100644 (file)
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -205,10 +205,6 @@ void __init plat_mem_setup(void)
                __dt_setup_arch((void *)KSEG0ADDR(fdt_start));
        else if (fw_arg0 == -2)
                __dt_setup_arch((void *)KSEG0ADDR(fw_arg1));
-#ifdef CONFIG_BUILTIN_DTB
-       else
-               __dt_setup_arch(__dtb_start);
-#endif
 
        ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
                                           AR71XX_RESET_SIZE);

diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 2d61455d585d2d59f87616d872db5297b98b2ce5..14bd225142832f15822fd44513380eaa4b72f2e6 100644 (file)
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,9 +1,6 @@
 # All DTBs
 dtb-$(CONFIG_ATH79)                    += ar9132_tl_wr1043nd_v1.dtb
 
-# Select a DTB to build in the kernel
-obj-$(CONFIG_DTB_TL_WR1043ND_V1)       += ar9132_tl_wr1043nd_v1.dtb.o
-
 # Force kbuild to make empty built-in.o if necessary
 obj-                           += dummy.o