From c57e182b560e4c93377270d470600095c2b580fe Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Jun 2018 21:01:32 +0200 Subject: ath79: lzma-loader: sync with ar71xx target Import all improvements made in the lzma-loader since development on the ath79 target started. This also reverts fe594bf90d09 ("ath79: fix loader-okli, lzma-loader"), as is obsoleted by 2ad60168b6af ("ar71xx: lzma-loader: move padding workaround to gzip step"). Likely, many of the changes should be ported to the ramips lzma-loader as well, but I don't have a device to test this. Signed-off-by: Matthias Schiffer --- target/linux/ath79/image/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux/ath79/image/Makefile') diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index cd136b23b9..34dd819610 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -29,8 +29,9 @@ define Build/loader-okli-compile $(call Build/loader-common,FLASH_OFFS=$(LOADER_FLASH_OFFS) FLASH_MAX=0) endef +# Arguments: define Build/loader-okli - dd if=$(KDIR)/loader-$(1).gz bs=7680 conv=sync of="$@.new" + dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new" cat "$@" >> "$@.new" mv "$@.new" "$@" endef -- cgit v1.2.3