From e827f8f702da7b8095000d589978b494b15f02d1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 6 Jun 2023 13:05:50 +0100 Subject: [PATCH] mediatek: use DEVICE_DTC_FLAGS and drop DTC_FLAGS where not needed The MT7986 RFB was intended to use device tree overlays and for that reason modified DTC_FLAGS. zyxel_ex5601-t0-stock later on probably copied it from there. Both boards do not actually use device tree overlays, so remove setting DTC_FLAGS from both. The BPi-R3 does use device tree overlays, use DEVICE_DTC_FLAGS to give it an extra 4kb of padding for overlays to be applied. Signed-off-by: Daniel Golle (cherry picked from commit 98e6ea32a400b10b425e0efdf5a8109a0dfd48fe) --- target/linux/mediatek/image/filogic.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 31c576983b..6323a05de2 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -135,7 +135,7 @@ define Device/bananapi_bpi-r3 KERNEL_INITRAMFS := kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata - DTC_FLAGS += -@ --space 32768 + DEVICE_DTC_FLAGS := --pad 4096 DEVICE_COMPAT_VERSION := 1.1 DEVICE_COMPAT_MESSAGE := Device tree overlay mechanism needs bootloader update endef @@ -195,7 +195,6 @@ define Device/mediatek_mt7986a-rfb-nand fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL_INITRAMFS = kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd - DTC_FLAGS += -@ --space 32768 endef TARGET_DEVICES += mediatek_mt7986a-rfb-nand @@ -367,6 +366,5 @@ define Device/zyxel_ex5601-t0-stock fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL_INITRAMFS = kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd - DTC_FLAGS += -@ --space 32768 endef TARGET_DEVICES += zyxel_ex5601-t0-stock -- 2.30.2