hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 8194f9ef4a)
openwrt-18.06
Jo-Philipp Wich 2018-07-17 14:40:04 +02:00
parent 1086408b17
commit f8cc68670f
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/mediatek/image/Makefile
View File

@ -16,12 +16,6 @@ ifeq ($(SUBTARGET),mt7622)
KERNEL_LOADADDR = 0x41080000 KERNEL_LOADADDR = 0x41080000
endif 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 # default all platform image(fit) build
define Device/Default define Device/Default
PROFILES = Default $$(DEVICE_NAME) PROFILES = Default $$(DEVICE_NAME)
@ -32,13 +26,13 @@ define Device/Default
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
ifeq ($(SUBTARGET),mt7623) ifeq ($(SUBTARGET),mt7623)
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := dtb | kernel-bin | append-dtb | uImage none KERNEL := kernel-bin | append-dtb | uImage none
KERNEL_INITRAMFS := dtb | kernel-bin | append-dtb | uImage none KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
endif endif
ifeq ($(SUBTARGET),mt7622) ifeq ($(SUBTARGET),mt7622)
KERNEL_NAME := Image KERNEL_NAME := Image
KERNEL = 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 = dtb | kernel-bin | lzma | fit lzma $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
endif endif
endef endef