X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fimage%2FMakefile;h=734f27e689c9d76abedad8c89f22a24006ba86ae;hb=1c6e0f57a791880d7d204000bf4e095c13c5725a;hp=cbd205bc7828d21d18115f24d4970e4b6fcbd4fe;hpb=f7ec385c1381db731cd5f1d22fe31149ffcbbb5e;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index cbd205bc78..734f27e689 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: <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,12 @@ include ./generic.mk
 include ./generic-tp-link.mk
 include ./generic-ubnt.mk
 endif
+ifeq ($(SUBTARGET),nand)
+include ./nand.mk
+endif
+ifeq ($(SUBTARGET),tiny)
+include ./tiny.mk
+include ./tiny-netgear.mk
+include ./tiny-tp-link.mk
+endif
 $(eval $(call BuildImage))