From 3806899a50152bc7c8cd41ca4285b937152c0fce Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Thu, 27 Jun 2019 20:44:27 +0800 Subject: ramips: use upstream RAW_APPENDED_DTB instead of our OWRTDTB Upstream kernel added support for RAW_APPENDED_DTB on ralink arch in the following commit: 02564fc89d3d ("ralink: Introduce fw_passed_dtb to arch/mips/ralink") Use upstream solution and get rid of our OWRTDTB hack. This commit set DEVICE_DTS to $$(DTS) instead of replacing DTS with DEVICE_DTS in device profile because DTS variable will be dropped in later commits. Signed-off-by: Chuanhong Guo [Tested on mt7621/mt76x8] Tested-by: Chuanhong Guo [Tested on rt305x/mt7620] Tested-by: INAGAKI Hiroshi (cherry picked from commit 7a8d3432c739c6ff038295176e8b6324e92fc116) Signed-off-by: Piotr Dymacz --- target/linux/ramips/image/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'target/linux/ramips/image/Makefile') diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 0a32859bec..07251aebba 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -19,12 +19,12 @@ loadaddr-$(CONFIG_TARGET_ramips_mt7621) := 0x80001000 KERNEL_LOADADDR := $(loadaddr-y) -KERNEL_DTB = kernel-bin | patch-dtb | lzma +KERNEL_DTB = kernel-bin | append-dtb | lzma define Device/Default - PROFILES = Default $$(DTS) - KERNEL_DEPENDS = $$(wildcard ../dts/$$(DTS).dts) + PROFILES = Default KERNEL := $(KERNEL_DTB) | uImage lzma DEVICE_DTS_DIR := ../dts + DEVICE_DTS = $$(DTS) IMAGES := sysupgrade.bin IMAGE_SIZE := $(ralink_default_fw_size_8M) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) @@ -52,11 +52,6 @@ define Build/jcg-header mv $@.new $@ endef -define Build/patch-dtb - $(call Image/BuildDTB,../dts/$(DTS).dts,$@.dtb) - $(STAGING_DIR_HOST)/bin/patch-dtb $@ $@.dtb -endef - define Build/trx $(STAGING_DIR_HOST)/bin/trx $(1) \ -o $@ \ -- cgit v1.2.3