0084-ar71xx-rename-mktplinkfw-initramfs-to-more-generic-mktplinkfw-combined.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Fri, 9 Dec 2016 13:08:51 +0100
  3. Subject: ar71xx: rename mktplinkfw-initramfs to more generic mktplinkfw-combined
  4. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  5. Backport of LEDE 0495181529e6069af03704f4b5ae71883a2cd6b6
  6. diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
  7. index b35c713f3c92c3d02f26f4bf535aeec34fd71b12..638e97f088b5420cf4f2a3c706875677815240e1 100644
  8. --- a/target/linux/ar71xx/image/Makefile
  9. +++ b/target/linux/ar71xx/image/Makefile
  10. @@ -63,7 +63,7 @@ define Build/mktplinkfw
  11. endef
  12. # -c combined image
  13. -define Build/mktplinkfw-initramfs
  14. +define Build/mktplinkfw-combined
  15. $(STAGING_DIR_HOST)/bin/mktplinkfw \
  16. -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \
  17. -k $@ \
  18. @@ -203,7 +203,7 @@ TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2
  19. define Device/tplink
  20. TPLINK_HWREV := 0x1
  21. KERNEL := kernel-bin | patch-cmdline | lzma
  22. - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs
  23. + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined
  24. IMAGES := sysupgrade.bin factory.bin
  25. IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
  26. IMAGE/factory.bin := append-rootfs | mktplinkfw factory
  27. @@ -215,7 +215,7 @@ $(Device/tplink)
  28. COMPILE := loader-$(1).gz
  29. COMPILE/loader-$(1).gz := loader-okli-compile
  30. KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1)
  31. - KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-initramfs
  32. + KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-combined
  33. endef
  34. define Device/tplink-4m