diff options
| author | Chuanhong Guo <gch981213@gmail.com> | 2019-06-27 20:44:27 +0800 |
|---|---|---|
| committer | Piotr Dymacz <pepe2k@gmail.com> | 2019-11-24 17:49:35 +0100 |
| commit | 3806899a50152bc7c8cd41ca4285b937152c0fce (patch) | |
| tree | b7b79978946825aad2c441769c53a148693a6ce6 /target/linux/ramips/image | |
| parent | f97d2351e2c1282cdfa0e5126bd6eef56d0e8252 (diff) | |
| download | upstream-3806899a50152bc7c8cd41ca4285b937152c0fce.tar.gz upstream-3806899a50152bc7c8cd41ca4285b937152c0fce.tar.bz2 upstream-3806899a50152bc7c8cd41ca4285b937152c0fce.zip | |
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 <gch981213@gmail.com>
[Tested on mt7621/mt76x8]
Tested-by: Chuanhong Guo <gch981213@gmail.com>
[Tested on rt305x/mt7620]
Tested-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 7a8d3432c739c6ff038295176e8b6324e92fc116)
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
Diffstat (limited to 'target/linux/ramips/image')
| -rw-r--r-- | target/linux/ramips/image/Makefile | 11 | ||||
| -rw-r--r-- | target/linux/ramips/image/mt7621.mk | 2 | ||||
| -rw-r--r-- | target/linux/ramips/image/rt3883.mk | 2 |
3 files changed, 5 insertions, 10 deletions
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 $@ \ diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index f13e9c8a4f..fa222f7a89 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -106,7 +106,7 @@ define Device/dir-860l-b1 DTS := DIR-860L-B1 BLOCKSIZE := 64k SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb - KERNEL := kernel-bin | patch-dtb | relocate-kernel | lzma | uImage lzma + KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := D-Link DIR-860L B1 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index 4844abd1b7..b783994357 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -48,7 +48,7 @@ define Device/belkin_f9k1109v1 DEVICE_TITLE := Belkin F9K1109 Version 1.0 DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig IMAGE_SIZE := 7224k - KERNEL := kernel-bin | patch-dtb | lzma -d16 | uImage lzma + KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma # Stock firmware checks for this uImage image name during upload. UIMAGE_NAME := N750F9K1103VB endef |