aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-17 14:40:04 +0200
committerJo-Philipp Wich <jo@mein.io>2018-07-17 14:45:33 +0200
commitf8cc68670fcf2e6912ead308240ce1af4652b8c3 (patch)
tree2587f4c2052e610dbcad9f94f8d7172049ae3780
parent1086408b17fae23e362f8ed95163ebeefed007c7 (diff)
downloadupstream-f8cc68670fcf2e6912ead308240ce1af4652b8c3.tar.gz
upstream-f8cc68670fcf2e6912ead308240ce1af4652b8c3.tar.bz2
upstream-f8cc68670fcf2e6912ead308240ce1af4652b8c3.zip
mediatek: fix parallel build issues in image build code
Drop the parallel-unsafe custom Build/dtb macro and use the .dtb artifacts produced by the generic image build code. Also remove unused .dtb references in the mt7623 subtarget. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (backported from commit 8194f9ef4a5ab4587e8f6cf1aec96ba89c5766fd)
-rw-r--r--target/linux/mediatek/image/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/target/linux/mediatek/image/Makefile b/target/linux/mediatek/image/Makefile
index 6659d446d0..41ad6e0517 100644
--- a/target/linux/mediatek/image/Makefile
+++ b/target/linux/mediatek/image/Makefile
@@ -16,12 +16,6 @@ ifeq ($(SUBTARGET),mt7622)
KERNEL_LOADADDR = 0x41080000
endif
-# build dtb
-define Build/dtb
- $(call Image/BuildDTB,$(DEVICE_DTS_DIR)/$(DEVICE_DTS).dts,$(DEVICE_DTS_DIR)/$(DEVICE_DTS).dtb)
- $(CP) $(DEVICE_DTS_DIR)/$(DEVICE_DTS).dtb $(BIN_DIR)/
-endef
-
# default all platform image(fit) build
define Device/Default
PROFILES = Default $$(DEVICE_NAME)
@@ -32,13 +26,13 @@ define Device/Default
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
ifeq ($(SUBTARGET),mt7623)
KERNEL_NAME := zImage
- KERNEL := dtb | kernel-bin | append-dtb | uImage none
- KERNEL_INITRAMFS := dtb | kernel-bin | append-dtb | uImage none
+ KERNEL := kernel-bin | append-dtb | uImage none
+ KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
endif
ifeq ($(SUBTARGET),mt7622)
KERNEL_NAME := Image
- KERNEL = dtb | kernel-bin | lzma | fit lzma $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb
- KERNEL_INITRAMFS = dtb | kernel-bin | lzma | fit lzma $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb
+ KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+ KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
endif
endef