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>
This commit is contained in:
Alban Bedel 2016-01-26 08:27:16 +01:00 коммит произвёл Ralf Baechle
Родитель 8f4d4d1bfb
Коммит ea3a7085bf
3 изменённых файлов: 0 добавлений и 19 удалений

Просмотреть файл

@ -71,18 +71,6 @@ config ATH79_MACH_UBNT_XM
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the
Ubiquiti Networks XM (rev 1.0) board. 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 endmenu
config SOC_AR71XX config SOC_AR71XX

Просмотреть файл

@ -205,10 +205,6 @@ void __init plat_mem_setup(void)
__dt_setup_arch((void *)KSEG0ADDR(fdt_start)); __dt_setup_arch((void *)KSEG0ADDR(fdt_start));
else if (fw_arg0 == -2) else if (fw_arg0 == -2)
__dt_setup_arch((void *)KSEG0ADDR(fw_arg1)); __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, ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
AR71XX_RESET_SIZE); AR71XX_RESET_SIZE);

Просмотреть файл

@ -1,9 +1,6 @@
# All DTBs # All DTBs
dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb 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 # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o