Browse Source

ramips: merge relocate compile into build recipe

Compile the loader if the relocate-kernel image recipe is used and get
rid of the legacy build code to do so.

Signed-off-by: Mathias Kresin <[email protected]>
Mathias Kresin 7 years ago
parent
commit
78ca6a5578
2 changed files with 5 additions and 10 deletions
  1. 5 1
      target/linux/ramips/image/Makefile
  2. 0 9
      target/linux/ramips/image/mt7621.mk

+ 5 - 1
target/linux/ramips/image/Makefile

@@ -74,12 +74,16 @@ define Build/loader-kernel
 endef
 
 define Build/relocate-kernel
+	rm -rf [email protected]
+	$(CP) ../../generic/image/relocate [email protected]
+	$(MAKE) -C [email protected] KERNEL_ADDR=$(KERNEL_LOADADDR) CROSS_COMPILE=$(TARGET_CROSS)
 	( \
-		dd if=$(KDIR)/loader.bin bs=32 conv=sync && \
+		dd if=$@.relocate/loader.bin bs=32 conv=sync && \
 		perl -e '@s = stat("$@"); print pack("V", @s[7])' && \
 		cat $@ \
 	) > [email protected]
 	mv [email protected] $@
+	rm -rf [email protected]
 endef
 
 define MkCombineduImage

+ 0 - 9
target/linux/ramips/image/mt7621.mk

@@ -558,12 +558,3 @@ define Device/zbt-wg3526-32M
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbt-wg3526-32M
-
-# FIXME: is this still needed?
-define Image/Prepare
-#define Build/Compile
-	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)/loader.bin
-endef