Signed-off-by: Stijn Tintel <st...@linux-ipv6.be>
---
target/linux/ar71xx/image/Makefile | 5 ++++-
target/linux/ar71xx/image/legacy.mk | 6 ------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/target/linux/ar71xx/image/Makefile
b/target/linux/ar71xx/image/Makefile
index 56e07d8..26e9558 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -79,8 +79,11 @@ define Build/loader-okli
endef
define Build/relocate-kernel
+ rm -rf $(KDIR)/relocate
+ $(CP) ../../generic/image/relocate $(KDIR)
+ $(MAKE) -C $(KDIR)/relocate KERNEL_ADDR=$(KERNEL_LOADADDR)
CROSS_COMPILE=$(TARGET_CROSS)
( \
- dd if=$(KDIR)/relocate.bin bs=32 conv=sync && \
+ dd if=$(KDIR)/relocate/loader.bin bs=32 conv=sync && \
perl -e '@s = stat("$@"); print pack("N", @s[7])' && \
cat "$@" \
) > "$@.new"
diff --git a/target/linux/ar71xx/image/legacy.mk
b/target/linux/ar71xx/image/legacy.mk
index 14de229..58a65d4d 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -1101,12 +1101,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/BuildLoader,generic,elf,,,-initramfs)
endif
$(call Image/BuildLoader,generic,elf)
-
- # Note: not only used for legacy images
- rm -rf $(KDIR)/relocate
- $(CP) ../../generic/image/relocate $(KDIR)
- $(MAKE) -C $(KDIR)/relocate KERNEL_ADDR=$(KERNEL_LOADADDR)
CROSS_COMPILE=$(TARGET_CROSS)
- $(CP) $(KDIR)/relocate/loader.bin $(KDIR)/relocate.bin
endef
define Image/Prepare/Profile
--
2.7.3
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
