[openwrt/openwrt] ath79: replace custom uImageArcher generation

LEDE Commits lede-commits at lists.infradead.org
Sun Jun 28 19:08:36 EDT 2020


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f49063ba9214cd679bd9b0d5504eadd5d6d86d4e

commit f49063ba9214cd679bd9b0d5504eadd5d6d86d4e
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Mon Jun 29 01:07:00 2020 +0200

    ath79: replace custom uImageArcher generation
    
    The replaces the custom uImageArcher build step with the generic uImage
    build step. The only different between these two is the difference in
    the generated name.
    
    Tested on: TP-Link Archer C59 v1
    
    Acked-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/ath79/image/common-tp-link.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk
index 3ae377f78f..0b7b0e1935 100644
--- a/target/linux/ath79/image/common-tp-link.mk
+++ b/target/linux/ath79/image/common-tp-link.mk
@@ -1,14 +1,6 @@
 DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION
 DEVICE_VARS += TPLINK_BOARD_ID TPLINK_HWREVADD TPLINK_HVERSION
 
-define Build/uImageArcher
-	mkimage -A $(LINUX_KARCH) \
-		-O linux -T kernel -C $(1) -a $(KERNEL_LOADADDR) \
-		-e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
-	@mv $@.new $@
-endef
-
 define Device/tplink-v1
   DEVICE_VENDOR := TP-Link
   TPLINK_HWID := 0x0
@@ -88,7 +80,7 @@ endef
 
 define Device/tplink-safeloader-uimage
   $(Device/tplink-safeloader)
-  KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma
+  KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := $$(KERNEL)
 endef
 



More information about the lede-commits mailing list