summaryrefslogtreecommitdiffstats
path: root/arch/mips/ath79
diff options
context:
space:
mode:
authorAlban Bedel <albeu@free.fr>2016-01-26 02:27:16 -0500
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 08:01:37 -0400
commitea3a7085bfa85ad52118822df73123b7e7056dab (patch)
treee7c0bd88cb6ffdd95aaf2a2a0a61701de06f17b8 /arch/mips/ath79
parent8f4d4d1bfb47014f324309781917e4fd3eb6a316 (diff)
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>
Diffstat (limited to 'arch/mips/ath79')
-rw-r--r--arch/mips/ath79/Kconfig12
-rw-r--r--arch/mips/ath79/setup.c4
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 13c04cf54afa..dfc60209dc63 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -71,18 +71,6 @@ config ATH79_MACH_UBNT_XM
71 Say 'Y' here if you want your kernel to support the 71 Say 'Y' here if you want your kernel to support the
72 Ubiquiti Networks XM (rev 1.0) board. 72 Ubiquiti Networks XM (rev 1.0) board.
73 73
74choice
75 prompt "Build a DTB in the kernel"
76 optional
77 help
78 Select a devicetree that should be built into the kernel.
79
80 config DTB_TL_WR1043ND_V1
81 bool "TL-WR1043ND Version 1"
82 select BUILTIN_DTB
83 select SOC_AR913X
84endchoice
85
86endmenu 74endmenu
87 75
88config SOC_AR71XX 76config SOC_AR71XX
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 0e60b0f4c69f..906ddace159a 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -205,10 +205,6 @@ void __init plat_mem_setup(void)
205 __dt_setup_arch((void *)KSEG0ADDR(fdt_start)); 205 __dt_setup_arch((void *)KSEG0ADDR(fdt_start));
206 else if (fw_arg0 == -2) 206 else if (fw_arg0 == -2)
207 __dt_setup_arch((void *)KSEG0ADDR(fw_arg1)); 207 __dt_setup_arch((void *)KSEG0ADDR(fw_arg1));
208#ifdef CONFIG_BUILTIN_DTB
209 else
210 __dt_setup_arch(__dtb_start);
211#endif
212 208
213 ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE, 209 ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
214 AR71XX_RESET_SIZE); 210 AR71XX_RESET_SIZE);