diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2016-10-21 17:50:39 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2016-10-27 01:50:42 +0300 |
| commit | 6b0d279ca58bf6173b57c7e9b759be4552eab74a (patch) | |
| tree | d7721a20792f65615a40d35f235c0316a1eab33f /target/linux/ar71xx/image | |
| parent | e19427bd7988c77e3e682d7804386702ef69b593 (diff) | |
| download | upstream-6b0d279ca58bf6173b57c7e9b759be4552eab74a.tar.gz upstream-6b0d279ca58bf6173b57c7e9b759be4552eab74a.tar.bz2 upstream-6b0d279ca58bf6173b57c7e9b759be4552eab74a.zip | |
ar71xx: build relocate stub for generic and legacy images
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ar71xx/image')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 5 | ||||
| -rw-r--r-- | 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 56e07d82f3..26e955840a 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 ec28fcbe77..08305da3ea 100644 --- a/target/linux/ar71xx/image/legacy.mk +++ b/target/linux/ar71xx/image/legacy.mk @@ -1097,12 +1097,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 |