diff options
| author | Alban Bedel <albeu@free.fr> | 2016-01-26 08:27:16 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-05-13 14:01:37 +0200 |
| commit | ea3a7085bfa85ad52118822df73123b7e7056dab (patch) | |
| tree | e7c0bd88cb6ffdd95aaf2a2a0a61701de06f17b8 /arch | |
| parent | 8f4d4d1bfb47014f324309781917e4fd3eb6a316 (diff) | |
| download | blackbird-op-linux-ea3a7085bfa85ad52118822df73123b7e7056dab.tar.gz blackbird-op-linux-ea3a7085bfa85ad52118822df73123b7e7056dab.zip | |
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')
| -rw-r--r-- | arch/mips/ath79/Kconfig | 12 | ||||
| -rw-r--r-- | arch/mips/ath79/setup.c | 4 | ||||
| -rw-r--r-- | arch/mips/boot/dts/qca/Makefile | 3 |
3 files changed, 0 insertions, 19 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 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 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) __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 2d61455d585d..14bd22514283 100644 --- 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 |
