ath79: lzma-loader: sync with ar71xx target

[openwrt/staging/hauke.git] / target / linux / ath79 / image / Makefile

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index cbd205bc7828d21d18115f24d4970e4b6fcbd4fe..34dd81961032203dfd4bbca5ba14a3082b80fece 100644 (file)
--- 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: <output name> <kernel offset>
 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
@@ -48,9 +49,6 @@ define Build/relocate-kernel
        rm -rf $@.relocate
 endef
 
-define Build/copy-file
-       cat "$(1)" > "$@"
-endef
 
 define Device/Default
   ATH_SOC :=
@@ -73,4 +71,7 @@ include ./generic.mk
 include ./generic-tp-link.mk
 include ./generic-ubnt.mk
 endif
+ifeq ($(SUBTARGET),tiny)
+include ./tiny-tp-link.mk
+endif
 $(eval $(call BuildImage))