Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alban Bedel and committed by
Ralf Baechle
ea3a7085 8f4d4d1b

-19
-12
arch/mips/ath79/Kconfig
··· 71 71 Say 'Y' here if you want your kernel to support the 72 72 Ubiquiti Networks XM (rev 1.0) board. 73 73 74 - choice 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 84 - endchoice 85 - 86 74 endmenu 87 75 88 76 config SOC_AR71XX
-4
arch/mips/ath79/setup.c
··· 205 205 __dt_setup_arch((void *)KSEG0ADDR(fdt_start)); 206 206 else if (fw_arg0 == -2) 207 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 209 ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE, 214 210 AR71XX_RESET_SIZE);
-3
arch/mips/boot/dts/qca/Makefile
··· 1 1 # All DTBs 2 2 dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb 3 3 4 - # Select a DTB to build in the kernel 5 - obj-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb.o 6 - 7 4 # Force kbuild to make empty built-in.o if necessary 8 5 obj- += dummy.o 9 6