From: Matthias Schiffer Date: Tue, 5 Jun 2018 22:34:25 +0000 (+0200) Subject: ar71xx: make loader-okli build step more generic X-Git-Tag: v18.06.0-rc1~90 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa87a5cffbbececbcd28861589db1ec3fcaabfa3;p=oweals%2Fopenwrt.git ar71xx: make loader-okli build step more generic Add support for different loader types. Signed-off-by: Matthias Schiffer --- diff --git a/target/linux/ar71xx/image/common-tp-link.mk b/target/linux/ar71xx/image/common-tp-link.mk index c448c97209..b50dae9f4f 100644 --- a/target/linux/ar71xx/image/common-tp-link.mk +++ b/target/linux/ar71xx/image/common-tp-link.mk @@ -4,8 +4,9 @@ define Build/copy-file cat "$(1)" > "$@" 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 @@ -60,7 +61,7 @@ define Device/tplink-nolzma LOADER_FLASH_OFFS := 0x22000 COMPILE := loader-$(1).gz COMPILE/loader-$(1).gz := loader-okli-compile - KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) + KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680 KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | tplink-v1-header endef