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 d8b8800d91dfe332c90a9ddc695ce24af3a27676..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 \
@@ -27,14 +19,17 @@ define Build/loader-common
 endef
 
 define Build/loader-kernel
-       $(call Build/loader-common,LOADER_DATA="$@")
+       $(call Build/loader-common, \
+               LOADER_DATA="$@" \
+               BOARD="$(DEVICE_NAME)" )
 endef
 
 define Build/loader-okli-compile
        $(call Build/loader-common, \
                FLASH_OFFS=$(LOADER_FLASH_OFFS) \
                FLASH_MAX=$(LOADER_FLASH_MAX) \
-               KERNEL_MAGIC=$(LOADER_KERNEL_MAGIC) )
+               KERNEL_MAGIC=$(LOADER_KERNEL_MAGIC) \
+               BOARD="$(DEVICE_NAME)" )
 endef
 
 # Arguments: <output name> <kernel offset>
@@ -48,6 +43,10 @@ define Build/append-loader-okli
        cat "$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE)" >> "$@"
 endef
 
+define Build/append-loader-okli-uimage
+       cat "$(KDIR)/loader-$(word 1,$(1)).uImage" >> "$@"
+endef
+
 define Build/relocate-kernel
        rm -rf $@.relocate
        $(CP) ../../generic/image/relocate $@.relocate
@@ -70,10 +69,22 @@ define Device/Default
   BLOCKSIZE := 64k
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
+  LOADER_KERNEL_MAGIC :=
+  LOADER_FLASH_MAX :=
+  LOADER_FLASH_OFFS :=
+  LOADER_TYPE :=
   COMPILE :=
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \
-       append-rootfs | pad-rootfs | append-metadata | check-size
+       append-rootfs | pad-rootfs | check-size | append-metadata
+endef
+
+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 := loader-okli-compile | pad-to 64k | \
+       lzma | uImage lzma
 endef
 
 include $(SUBTARGET).mk
@@ -86,6 +97,7 @@ endif
 ifeq ($(SUBTARGET),tiny)
 include tiny-netgear.mk
 include tiny-tp-link.mk
+include tiny-ubnt.mk
 endif
 
 $(eval $(call BuildImage))