commit 973bac34fc278959369e80361a6671c663294794
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Mon May 16 09:52:02 2016 +0200

    Base qMp firmware builder on LEDE. Also fix a few targets and configs that got outdated.

diff --git a/Makefile b/Makefile
index 66ff602..6ba71c3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@
 #	Agustí Moll
 #	Roger Pueyo Centelles
 
-OWRT_SCM = git clone git://git.openwrt.org/openwrt.git
-OWRT_PKG_SCM = git clone https://github.com/openwrt/packages.git
+LEDE_SOURCE_CLONE = git clone http://git.lede-project.org/source.git
+LEDE_PKG_CLONE = git clone https://github.com/openwrt/packages.git
 
 QMP_GIT_RW = ssh://gitolite@qmp.cat:qmp.git
 QMP_GIT_RO = git://qmp.cat/qmp.git
@@ -45,7 +45,7 @@ MAKE_SRC = -j$(J) V=$(V)
 
 IMAGEOPT ?= true
 VERSIONOPT ?= true
-VERSION_REPO ?= http://downloads.openwrt.org/snapshots/trunk
+VERSION_REPO ?= http://downloads.lede-project.org/snapshots
 VERSION_DIST ?= qMp
 VERSION_NICK ?= Kalimotxo
 VERSION_CODE ?= Kalimotxo
@@ -96,7 +96,7 @@ define copy_feeds_file
 endef
 
 define checkout_src
-	$(OWRT_SCM) $(BUILD_PATH)
+	$(LEDE_SOURCE_CLONE) $(BUILD_PATH)
 	mkdir -p dl
 	ln -fs ../../dl $(BUILD_PATH)/dl
 	ln -fs ../qmp/files $(BUILD_PATH)/files
@@ -106,7 +106,7 @@ define checkout_src
 endef
 
 define checkout_owrt_pkg_override
-	$(OWRT_PKG_SCM) $(BUILD_DIR)/packages.$(TARGET)
+	$(LEDE_PKG_CLONE) $(BUILD_DIR)/packages.$(TARGET)
 	sed -i -e "s|src-link packages .*|src-link packages `pwd`/$(BUILD_DIR)/packages.$(TARGET)|" $(BUILD_PATH)/feeds.conf
 endef
 
@@ -215,11 +215,11 @@ all: build
 	@touch $@
 
 .checkout_owrt_pkg:
-	$(OWRT_PKG_SCM) $(BUILD_DIR)/packages
+	$(LEDE_PKG_CLONE) $(BUILD_DIR)/packages
 	@touch $@
 
 .checkout_owrt_pkg_override:
-	$(if $(filter $(origin OWRT_PKG_SCM),override),$(if $(wildcard .checkout_owrt_pkg_override_$(TARGET)),,$(call checkout_owrt_pkg_override)),)
+	$(if $(filter $(origin LEDE_PKG_CLONE),override),$(if $(wildcard .checkout_owrt_pkg_override_$(TARGET)),,$(call checkout_owrt_pkg_override)),)
 	@touch .checkout_owrt_pkg_override_$(TARGET)
 
 .checkout_owrt:
diff --git a/README b/README
index 6b0dca5..927af34 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Developer URL: ssh://gitosis@qmp.cat:221/qmpfw.git
 
 To compile a qMp image from scratch, you need to specify the target (next example with target=rspro):
 This command will run all necessary commands to compile the image. After the compilation you can see the 
-OpenWRT code in directory: build/[target]
+LEDE code in directory: build/[target]
 
     make T=rspro build
 
@@ -47,14 +47,14 @@ To syncronize config files from configs/ dir to existing target
     make T=rspro sync_config
 
 ---------------------------------------------------------------------------------
-To run menuconfig (from openwrt):
+To run menuconfig (from LEDE):
 
     make T=rspro menuconfig
 
 After that, the new config file will be applied to destination target and also it will by copied inside build/configs directory
 
 ---------------------------------------------------------------------------------
-To run kernel menuconfig (from openwrt), in this case config file will be not copied because it is not directly compatible with configs/target/kernel_config:
+To run kernel menuconfig (from LEDE), in this case config file will be not copied because it is not directly compatible with configs/target/kernel_config:
 
     make T=rspro kernel_menuconfig
 
@@ -105,7 +105,7 @@ There are several directories and files. This is the functionallity for each of
 
     - build/configs: if you do some change in config file using "menuconfig" option, the new config is placed here (and also in destination target)
 
-    - dl: download folder for OpenWRT packages
+    - dl: download folder for LEDE/OpenWrt packages
 
     - configs: config files for each kind of hardware. These are the default ones provided by qmpfw
 
diff --git a/configs/ar71xx-generic-imagebuilder b/configs/ar71xx-generic-imagebuilder
new file mode 100644
index 0000000..f174a61
--- /dev/null
+++ b/configs/ar71xx-generic-imagebuilder
@@ -0,0 +1,2 @@
+CONFIG_TARGET_ar71xx=y
+CONFIG_ALL=y
diff --git a/configs/ar71xx-imagebuilder b/configs/ar71xx-imagebuilder
deleted file mode 100644
index f174a61..0000000
--- a/configs/ar71xx-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_ar71xx=y
-CONFIG_ALL=y
diff --git a/configs/ath25-generic-imagebuilder b/configs/ath25-generic-imagebuilder
new file mode 100644
index 0000000..9f91d70
--- /dev/null
+++ b/configs/ath25-generic-imagebuilder
@@ -0,0 +1,2 @@
+CONFIG_TARGET_atheros=y
+CONFIG_ALL=y
diff --git a/configs/atheros-imagebuilder b/configs/atheros-imagebuilder
deleted file mode 100644
index 9f91d70..0000000
--- a/configs/atheros-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_atheros=y
-CONFIG_ALL=y
diff --git a/configs/mpc85xx-generic-imagebuilder b/configs/mpc85xx-generic-imagebuilder
new file mode 100644
index 0000000..4c1e5d1
--- /dev/null
+++ b/configs/mpc85xx-generic-imagebuilder
@@ -0,0 +1,2 @@
+CONFIG_TARGET_mpc85xx=y
+CONFIG_ALL=y
diff --git a/configs/mpc85xx-imagebuilder b/configs/mpc85xx-imagebuilder
deleted file mode 100644
index 4c1e5d1..0000000
--- a/configs/mpc85xx-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_mpc85xx=y
-CONFIG_ALL=y
diff --git a/configs/ramips-imagebuilder b/configs/ramips-imagebuilder
deleted file mode 100644
index 58387ef..0000000
--- a/configs/ramips-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_ramips=y
-CONFIG_ALL=y
diff --git a/configs/ramips-mt7620-imagebuilder b/configs/ramips-mt7620-imagebuilder
new file mode 100644
index 0000000..4cb9102
--- /dev/null
+++ b/configs/ramips-mt7620-imagebuilder
@@ -0,0 +1,3 @@
+CONFIG_TARGET_ramips=y
+CONFIG_TARGET_ramips_mt7620=y
+CONFIG_ALL=y
diff --git a/configs/ramips-rt305x-imagebuilder b/configs/ramips-rt305x-imagebuilder
new file mode 100644
index 0000000..e6a92f5
--- /dev/null
+++ b/configs/ramips-rt305x-imagebuilder
@@ -0,0 +1,3 @@
+CONFIG_TARGET_ramips=y
+CONFIG_TARGET_ramips_rt305x=y
+CONFIG_ALL=y
diff --git a/configs/x86-generic-imagebuilder b/configs/x86-generic-imagebuilder
new file mode 100644
index 0000000..5ff47fd
--- /dev/null
+++ b/configs/x86-generic-imagebuilder
@@ -0,0 +1,2 @@
+CONFIG_TARGET_x86=y
+CONFIG_ALL=y
diff --git a/configs/x86-geode-imagebuilder b/configs/x86-geode-imagebuilder
new file mode 100644
index 0000000..2c6a65a
--- /dev/null
+++ b/configs/x86-geode-imagebuilder
@@ -0,0 +1,3 @@
+CONFIG_TARGET_x86=y
+CONFIG_TARGET_x86_geode=y
+CONFIG_ALL=y
diff --git a/configs/x86-imagebuilder b/configs/x86-imagebuilder
deleted file mode 100644
index 5ff47fd..0000000
--- a/configs/x86-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_x86=y
-CONFIG_ALL=y
diff --git a/targets.mk b/targets.mk
index 9d40c70..d9f17c5 100644
--- a/targets.mk
+++ b/targets.mk
@@ -7,7 +7,8 @@
 #
 # For each target the next variables must be defined
 #  NAME := The name of the device used for output firmware file name
-#  ARCH := The OpenWRT architecture
+#  ARCH := The LEDE CPU architecture
+#  SUBARCH := The LEDE CPU subarchitecture
 #  IMAGE := The file path (relative to buildroot) to the firmware
 #  PROFILE := The profile used for the device (must coincide with a configs/xxx filename=
 #
@@ -19,447 +20,516 @@
 # Any option defined in Makefile can be overrided from here, for instance
 #  override OWRT_SVN = svn://mysvn.com/owrt
 
-HW_AVAILABLE := ar71xx bullet kvm nsm2 nsm5 nsm5-xw nslm5-xw rocket-m-xw pico2 rocket rs rspro mc-mac1200r tl-2543 tl-703n tl-wr841n-v7 tl-wr841n-v8 tl-wr841n-v9 tl-842 tl-mr3020 tl-mr3040 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 wpe72 dragino2 alix soekris45xx x86 uap-pro unifi-ap vbox vmware vocore wt1520-4m wt1520-8m cf-wr800n dir-810l microwrt wrtnode wt3020-4m wt3020-8m xiaomi-miwifi-mini ar71xx-ib ath25-ib mpc85xx-ib ramips-ib x86-ib
-TBUILD_LIST := openwrt
+HW_AVAILABLE := ar71xx bullet kvm nsm2 nsm5 nsm5-xw nslm5-xw rocket-m-xw pico2 rocket rs rspro mc-mac1200r tl-2543 tl-703n tl-wr841n-v7 tl-wr841n-v8 tl-wr841n-v9 tl-842 tl-mr3020 tl-mr3040 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 wpe72 dragino2 alix soekris45xx x86 uap-pro unifi-ap vbox vmware vocore wt1520-4m wt1520-8m cf-wr800n dir-810l microwrt wrtnode wt3020-4m wt3020-8m miwifi-mini ar71xx-generic-ib ath25-generic-ib mpc85xx-generic-ib ramips-mt7620-ib ramips-rt305x-ib x86-generic-ib x86-geode-ib
+TBUILD_LIST := lede
 
 ifeq ($(T),ar71xx)
   NAME:=Generic_ar71xx
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
 endif
 
 ifeq ($(T),alix)
   NAME:=PC-Engines_Alix
   ARCH:=x86
-  TBUILD:=openwrt
+  SUBARCH:=geode
+  TBUILD:=lede
   PROFILE:=x86-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-geode-combined-squashfs.img
-  SYSUPGRADE:=bin/$(ARCH)/qmp-x86-geode-combined-squashfs.img
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-geode-combined-squashfs.img
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-geode-combined-squashfs.img
 endif
 
 ifeq ($(T),x86)
   NAME:=Generic_x86
   ARCH:=x86
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=x86-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-generic-combined-squashfs.img
-  SYSUPGRADE:=bin/$(ARCH)/qmp-x86-generic-combined-squashfs.img
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-squashfs.img
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-squashfs.img
 endif
 
 ifeq ($(T),soekris45xx)
   NAME:=Soekris_Net45xx
   ARCH:=x86
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=x86-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-generic-combined-squashfs.img
-  SYSUPGRADE:=bin/$(ARCH)/qmp-x86-generic-combined-squashfs.img
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-squashfs.img
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-squashfs.img
 endif
 
 ifeq ($(T),bullet)
   NAME:=Ubiquiti_Bullet-M
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-bullet-m-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-bullet-m-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),cf-wr800n)
   NAME:=Comfast_CF-WR800N
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-cf-wr800n-squashfs-sysupgrade.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-mt7620-cf-wr800n-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-cf-wr800n-squashfs-sysupgrade.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-cf-wr800n-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),nsm2)
   NAME:=Ubiquiti_NanoStation-M2
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),nsm5)
   NAME:=Ubiquiti_NanoStation-M5
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),nsm5-xw)
   NAME:=Ubiquiti_NanoStation-M5-XW
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-xw-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-nano-m-xw-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-xw-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-nano-m-xw-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),nslm5-xw)
   NAME:=Ubiquiti_NanoStation-Loco-M5-XW
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-loco-m-xw-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-loco-m-xw-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),rocket-m-xw)
   NAME:=Ubiquiti_Rocket-M5-XW
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rocket-m-xw-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rocket-m-xw-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rocket-m-xw-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rocket-m-xw-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),pico2)
   NAME:=Ubiquiti_PicoStation-2
   ARCH:=ath25
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=at2-qmp-tiny-node
   BUILD_PATH:=$(BUILD_DIR)/ath25
-  IMAGE:=bin/$(ARCH)/qmp-ath25-ubnt2-pico2-squashfs.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ath25-ubnt2-pico2-squashfs.bin
 endif
 
 ifeq ($(T),rocket)
   NAME:=Ubiquiti_Rocket-M
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rocket-m-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rocket-m-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rocket-m-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rocket-m-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),rs)
   NAME:=Ubiquiti_RouterStation
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rs-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rs-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rs-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rs-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),rspro)
   NAME:=Ubiquiti_RouterStation-Pro
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rspro-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-rspro-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rspro-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-rspro-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-2543)
   NAME:=TP-Link_TL-WR2543ND-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr2543-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr2543-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr2543-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr2543-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),mc-mac1200r)
   NAME:=Mercury_MAC1200R
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-mc-mac1200r-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-mc-mac1200r-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-mc-mac1200r-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-mc-mac1200r-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wr841n-v7)
   NAME:=TP-Link_TL-WR841N-v7
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ar71xx_kstrip-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841nd-v7-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841nd-v7-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wr841n-v8)
   NAME:=TP-Link_TL-WR841N-v8
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ar71xx_kstrip-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841n-v8-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841n-v8-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wr841n-v9)
   NAME:=TP-Link_TL-WR841N-v9
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ar71xx_kstrip-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841n-v9-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841n-v9-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-842)
   NAME:=TP-Link_TL-WR842ND-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr842n-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr842n-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr842n-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr842n-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-703n)
   NAME:=TP-Link_TL-WR703N-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin
 endif
 
 
 ifeq ($(T),tl-mr3020)
   NAME:=TP-Link_TL-MR3020-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-mr3020-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-mr3020-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-mr3040)
   NAME:=TP-Link_TL-MR3040-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-mr3040-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-mr3040-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-mr3040-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-mr3040-v1-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),tl-wdr3600)
   NAME:=TP-Link_TL-WDR3600-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wdr3600-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wdr3600-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wdr4300)
   NAME:=TP-Link_TL-WDR4300-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wdr4300-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wdr4300-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wdr4900-v1)
   NAME:=TP-Link_TL-WDR4900-v1
   ARCH:=mpc85xx
-  TBUILD:=openwrt
-  IMAGE:=bin/$(ARCH)/qmp-mpc85xx-generic-tl-wdr4900-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin
+  SUBARCH:=generic
+  TBUILD:=lede
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-mpc85xx-generic-tl-wdr4900-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wr743nd)
   NAME:=TP-Link_TL-WR743ND-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr743nd-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr743nd-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr743nd-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr743nd-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),tl-wr740n)
   NAME:=TP-Link_TL-WR740N-v1
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr740n-v1-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-tl-wr740n-v1-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr740n-v1-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-tl-wr740n-v1-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),wpe72)
   NAME:=Compex_WPE72
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-wpe72-squashfs-8M-factory.img
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-wpe72-squashfs-8M-factory.img
 endif
 
 ifeq ($(T),dragino2)
   NAME:=Dragino_MS14
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-dragino2-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-dragino2-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-dragino2-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-dragino2-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),unifi-ap)
   NAME:=Ubiquiti_UniFi-AP
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-unifi-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-unifi-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),uap-pro)
   NAME:=Ubiquiti_UniFi-AP-PRO
   ARCH:=ar71xx
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=ath-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-uap-pro-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ar71xx-generic-ubnt-uap-pro-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-uap-pro-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ar71xx-generic-ubnt-uap-pro-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),vbox)
   NAME:=VirtualBox_x86
   ARCH:=x86
-  TBUILD:=openwrt
+  SUBARCH:=generic
+  TBUILD:=lede
   PROFILE:=vm-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-generic-combined-ext4.img.gz
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-ext4.img.gz
 endif
 
 ifeq ($(T),vmware)
   NAME:=VMware_x86
   ARCH:=x86
-  TBUILD:=openwrt
+  TBUILD:=lede
   PROFILE:=vm-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-generic-combined-ext4.vmdk
-  SYSUPGRADE:=bin/$(ARCH)/qmp-x86-generic-combined-ext4.vmdk
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-ext4.vmdk
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-generic-combined-ext4.vmdk
 endif
 
 ifeq ($(T),vocore)
   NAME:=Vonger_VoCore
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=rt305x
+  TBUILD:=lede
   PROFILE:=rt5350-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-rt305x-vocore-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-rt305x-vocore-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),microwrt)
   NAME:=Microduino_MicroWRT
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-microwrt-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-microwrt-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),wrtnode)
   NAME:=WRTnode_WRTnode
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-wrtnode-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-wrtnode-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),wt1520-4m)
   NAME:=Nexx_WT1520-4M
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=rt305x
+  TBUILD:=lede
   PROFILE:=rt5350-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-rt305x-wt1520-4M-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-rt305x-wt1520-4M-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-rt305x-wt1520-4M-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-rt305x-wt1520-4M-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),wt1520-8m)
   NAME:=Nexx_WT1520-8M
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=rt305x
+  TBUILD:=lede
   PROFILE:=rt5350-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-rt305x-wt1520-8M-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-rt305x-wt1520-8M-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-rt305x-wt1520-8M-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-rt305x-wt1520-8M-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),wt3020-4m)
   NAME:=Nexx_WT3020-4M
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620_kstrip-qmp-tiny-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-wt3020-4M-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-mt7620-wt3020-4M-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-wt3020-4M-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-wt3020-4M-squashfs-sysupgrade.bin
 endif
 
 ifeq ($(T),wt3020-8m)
   NAME:=Nexx_WT3020-8M
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-wt3020-8M-squashfs-factory.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-mt7620-wt3020-8M-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-wt3020-8M-squashfs-factory.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-wt3020-8M-squashfs-sysupgrade.bin
 endif
 
-ifeq ($(T),xiaomi-miwifi-mini)
+ifeq ($(T),miwifi-mini)
   NAME:=Xiaomi_MiWiFi-Mini
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-xiaomi-miwifi-mini-squashfs-sysupgrade.bin
-  SYSUPGRADE:=bin/$(ARCH)/qmp-ramips-mt7620-xiaomi-miwifi-mini-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-miwifi-mini-squashfs-sysupgrade.bin
+  SYSUPGRADE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-miwifi-mini-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),dir-810l)
   NAME:=D-Link_DIR-810L
   ARCH:=ramips
-  TBUILD:=openwrt
+  SUBARCH:=mt7620
+  TBUILD:=lede
   PROFILE:=mt7620-qmp-small-node
-  IMAGE:=bin/$(ARCH)/qmp-ramips-mt7620-dir-810l-squashfs-sysupgrade.bin
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-ramips-mt7620-dir-810l-squashfs-sysupgrade.bin
 endif 
 
 ifeq ($(T),kvm)
   NAME:=KVM_x86
   ARCH:=x86
-  TBUILD:=openwrt
+  SUBARCH:=kvm_guest
+  TBUILD:=lede
   PROFILE:=kvm-qmp-big-node
-  IMAGE:=bin/$(ARCH)/qmp-x86-kvm_guest-combined-ext4.img.gz
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/qmp-x86-kvm_guest-combined-ext4.img.gz
 endif
 
-ifeq ($(T),ar71xx-ib)
-  NAME:=ar71xx_imagebuilder
+ifeq ($(T),ar71xx-generic-ib)
+  NAME:=ar71xx_generic_imagebuilder
   ARCH:=ar71xx
-  TBUILD:=openwrt
-  PROFILE:=ar71xx-imagebuilder
+  SUBARCH:=generic
+  TBUILD:=lede
+  PROFILE:=ar71xx-generic-imagebuilder
   override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
 endif
 
-ifeq ($(T),ath25-ib)
-  NAME:=ath25_imagebuilder
+ifeq ($(T),ath25-generic-ib)
+  NAME:=ath25_generic_imagebuilder
   ARCH:=ath25
-  TBUILD:=openwrt
-  PROFILE:=ath25-imagebuilder
+  SUBARCH:=generic
+  TBUILD:=lede
+  PROFILE:=ath25-generic-imagebuilder
   override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
 endif
 
-ifeq ($(T),mpc85xx-ib)
-  NAME:=mpc85xx_imagebuilder
+ifeq ($(T),mpc85xx-generic-ib)
+  NAME:=mpc85xx_generic_imagebuilder
   ARCH:=mpc85xx
-  TBUILD:=openwrt
-  PROFILE:=mpc85xx-imagebuilder
+  SUBARCH:=generic
+  TBUILD:=lede
+  PROFILE:=mpc85xx-generic-imagebuilder
   override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
 endif
 
-ifeq ($(T),ramips-ib)
-  NAME:=ramips_imagebuilder
+ifeq ($(T),ramips-mt7620-ib)
+  NAME:=ramips_mt7620_imagebuilder
   ARCH:=ramips
-  TBUILD:=openwrt
-  PROFILE:=ramips-imagebuilder
+  SUBARCH:=mt7620
+  TBUILD:=lede
+  PROFILE:=ramips-mt7620-imagebuilder
   override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
 endif
 
-ifeq ($(T),x86-ib)
-  NAME:=x86_imagebuilder
+ifeq ($(T),ramips-rt305x-ib)
+  NAME:=ramips_rt305x_imagebuilder
+  ARCH:=ramips
+  SUBARCH:=rt305x
+  TBUILD:=lede
+  PROFILE:=ramips-rt305x-imagebuilder
+  override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+endif
+
+ifeq ($(T),x86-generic-ib)
+  NAME:=x86_generic_imagebuilder
+  ARCH:=x86
+  SUBARCH:=generic
+  TBUILD:=lede
+  PROFILE:=x86-generic-imagebuilder
+  override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+endif
+
+ifeq ($(T),x86-geode-ib)
+  NAME:=x86_geode_imagebuilder
   ARCH:=x86
-  TBUILD:=openwrt
-  PROFILE:=x86-imagebuilder
+  SUBARCH:=geode
+  TBUILD:=lede
+  PROFILE:=x86-geode-imagebuilder
   override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
+  IMAGE:=bin/targets/$(ARCH)/$(SUBARCH)/LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-ar71xx-x86_64.tar.bz2
 endif