ar71xx: add support for Mikrotik RouterBOARD 2011UiAS-2HnD r2

[openwrt/openwrt.git] / include / image-commands.mk

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 47d7193434d16c39cb2fb0c87bef93dd29169a1d..8251a814000d2507676ccf51075860e86f64da18 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -297,14 +297,14 @@ endef
 define Build/qsdk-ipq-factory-nand
        $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \
                $@.its ubi $@
-       mkimage -f $@.its $@.new
+       PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
        @mv $@.new $@
 endef
 
 define Build/qsdk-ipq-factory-nor
        $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \
                $@.its hlos $(IMAGE_KERNEL) rootfs $(IMAGE_ROOTFS)
-       mkimage -f $@.its $@.new
+       PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
        @mv $@.new $@
 endef
 
@@ -355,12 +355,14 @@ json_quote=$(subst ','\'',$(subst ",\",$(1)))
 metadata_devices=$(if $(1),$(subst "$(space)","$(comma)",$(strip $(foreach v,$(1),"$(call json_quote,$(v))"))))
 metadata_json = \
        '{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \
+               "metadata_version": "1.0", \
                "supported_devices":[$(call metadata_devices,$(1))], \
                "version": { \
                        "dist": "$(call json_quote,$(VERSION_DIST))", \
                        "version": "$(call json_quote,$(VERSION_NUMBER))", \
                        "revision": "$(call json_quote,$(REVISION))", \
-                       "board": "$(call json_quote,$(BOARD))" \
+                       "target": "$(call json_quote,$(TARGETID))", \
+                       "board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \
                } \
        }'