ath79: image: don't depend on other COMPILE targets

[openwrt/staging/stintel.git] / target / linux / ath79 / image / Makefile

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 2a7a0abd50fcd291417490f5d4101a7c334ce2cd..8328be7667cf8dd675fc5b4571e1a7a61405c378 100644 (file)
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -8,14 +8,6 @@ DEVICE_VARS += LOADER_FLASH_MAX LOADER_KERNEL_MAGIC
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION
 
-define Build/combined-image
-       sh $(TOPDIR)/scripts/combined-image.sh \
-               "$(IMAGE_KERNEL)" \
-               "$@" \
-               "$@.new"
-       @mv $@.new $@
-endef
-
 define Build/loader-common
        rm -rf $@.src
        $(MAKE) -C lzma-loader \
@@ -91,7 +83,7 @@ define Device/loader-okli-uimage
   LOADER_TYPE := bin
   COMPILE := loader-$(1).bin loader-$(1).uImage
   COMPILE/loader-$(1).bin := loader-okli-compile
-  COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | \
+  COMPILE/loader-$(1).uImage := loader-okli-compile | pad-to 64k | \
        lzma | uImage lzma
 endef