commit f420c2ff76ab5aee2ea46805095ba0f584f9b79a
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Fri Jan 20 12:53:00 2017 +0100

    [multiprofile] Convert sunxi architecture to multiprofile

diff --git a/configs/sunxi-generic-imagebuilder b/configs/sunxi-generic-imagebuilder
deleted file mode 100644
index e34ea34..0000000
--- a/configs/sunxi-generic-imagebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_sunxi=y
-CONFIG_ALL=y
diff --git a/configs/sunxi-generic-multiprofile b/configs/sunxi-generic-multiprofile
new file mode 100644
index 0000000..ed0a36f
--- /dev/null
+++ b/configs/sunxi-generic-multiprofile
@@ -0,0 +1,19 @@
+CONFIG_TARGET_sunxi=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_ALL_PROFILES=y
+CONFIG_TARGET_PER_DEVICE_ROOTFS=y
+CONFIG_PACKAGE_qmp-system=y
+CONFIG_PACKAGE_qmp-tiny-node=m
+CONFIG_PACKAGE_qmp-small-node=m
+CONFIG_PACKAGE_qmp-big-node=m
+CONFIG_PACKAGE_luci-app-qos=m
+CONFIG_PACKAGE_luci-app-sqm=m
+CONFIG_PACKAGE_sqm-scripts=m
+CONFIG_PACKAGE_sqm-scripts-extra=m
+CONFIG_PACKAGE_tc=m
+CONFIG_PACKAGE_kmod-sched=m
+CONFIG_PACKAGE_kmod-sched-cake=m
+CONFIG_PACKAGE_ppp=m
+CONFIG_PACKAGE_kmod-ath9k-htc=y
+CONFIG_PACKAGE_kmod-rt2800-usb=y
+CONFIG_PACKAGE_usb-modeswitch=y
diff --git a/configs/sunxi-qmp-small-node b/configs/sunxi-qmp-small-node
deleted file mode 100644
index ab20e20..0000000
--- a/configs/sunxi-qmp-small-node
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_sunxi=y
-CONFIG_PACKAGE_qmp-small-node=y
diff --git a/configs/targets/lamobo-r1 b/configs/targets/lamobo-r1
deleted file mode 100644
index 0c5b6b8..0000000
--- a/configs/targets/lamobo-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TARGET_sunxi_Lamobo_R1=y
-# CONFIG_TARGET_IMAGES_GZIP is not set
diff --git a/targets.mk b/targets.mk
index dd284f3..a6bcc29 100644
--- a/targets.mk
+++ b/targets.mk
@@ -27,9 +27,11 @@ COMBINEDSQUASH := combined-squashfs.bin
 COMBINEDSQUASHIMG := combined-squashfs.img.gz
 COMBINEDSQUASHVDI := combined-squashfs.vdi
 COMBINEDSQUASHVMDK := combined-squashfs.vmdk
+EXT4SDCARD := ext4-sdcard.img.gz
 SDCARDVFATEXT4 := sdcard-vfat-ext4.img
 SQUASHFACTORY := squashfs-factory.bin
 SQUASHSYSUPGRADE := squashfs-sysupgrade.bin
+SQUASHFSSDCARD := squashfs-sdcard.img.gz
 
 BINEXT := bin
 
@@ -41,8 +43,8 @@ TBUILD_LIST := lede
 
 DISTLEGACY:=lede
 
-MP_AVAILABLE := ath25-generic ar71xx-generic brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x x86-generic x86-geode x86-64
-HW_AVAILABLE := alfa-nx alix bullet cf-wr800n dir-810l dragino2 kvm kvm64 lamobo-r1 mc-mac1200r microwrt miwifi-mini nslm5-xw nsm2 nsm5 nsm5-xw pico2 rocket-m rocket-m-xw rs rspro soekris45xx tl-2543-v1 tl-842n-v1 tl-mr3020-v1 tl-mr3040-v1 tl-wa7510n tl-wdr3500-v1 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 tl-wr703n-v1 tl-wr743nd-v1 tl-wr841-v10 tl-wr841-v7 tl-wr841-v8 tl-wr841-v9 uap-pro unifiac-lite unifi-ap vbox vbox64 vmware vmware64 vocore-16M vocore-8M wl-wn575a3 wpe72-8M wrtnode wt1520-4M wt1520-8M wt3020-4M wt3020-8M x86 x86-64 zbt-ape522ii sunxi-generic-ib
+MP_AVAILABLE := ath25-generic ar71xx-generic brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi-generic x86-generic x86-geode x86-64
+HW_AVAILABLE := alfa-nx alix bullet cf-wr800n dir-810l dragino2 kvm kvm64 lamobo-r1 mc-mac1200r microwrt miwifi-mini nslm5-xw nsm2 nsm5 nsm5-xw pico2 rocket-m rocket-m-xw rs rspro soekris45xx tl-2543-v1 tl-842n-v1 tl-mr3020-v1 tl-mr3040-v1 tl-wa7510n tl-wdr3500-v1 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 tl-wr703n-v1 tl-wr743nd-v1 tl-wr841-v10 tl-wr841-v7 tl-wr841-v8 tl-wr841-v9 uap-pro unifiac-lite unifi-ap vbox vbox64 vmware vmware64 vocore-16M vocore-8M wl-wn575a3 wpe72-8M wrtnode wt1520-4M wt1520-8M wt3020-4M wt3020-8M x86 x86-64 zbt-ape522ii
 
 ifeq ($(MPT),ath25-generic)
   TBUILD:=lede
@@ -145,6 +147,16 @@ ifeq ($(MPT),ramips-rt305x)
   BIG:=
 endif
 
+ifeq ($(MPT),sunxi-generic)
+  TBUILD:=lede
+  ARCH:=sunxi
+  SUBARCH:=generic
+  DEVPKG:=CONFIG_TARGET_DEVICE_PACKAGES_$(ARCH)_DEVICE_$(DEVICE)
+  TINY:=
+  SMALL:=
+  BIG:=sun7i-a20-lamobo-r1
+endif
+
 #This architecture is not really multi-profile, but generates all images
 ifeq ($(MPT),x86-generic)
   TBUILD:=lede
@@ -296,9 +308,10 @@ ifeq ($(T),lamobo-r1)
   ARCH:=sunxi
   SUBARCH:=generic
   TBUILD:=lede
-  MPNAME:=
-  PROFILE:=sunxi-qmp-small-node
-  IMAGE:=$(DISTCL)-$(ARCH)-$(NAME)-$(SDCARDVFATEXT4)
+  MPNAME:=sun7i-a20-lamobo-r1
+  SQUASHIMAGE:=$(DISTCL)-$(ARCH)-$(MPNAME)-$(SQUASHFSSDCARD)
+  EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(MPNAME)-$(EXT4SDCARD)
+  BINEXT=img.gz
 endif
 
 ifeq ($(T),rocket-m-xw)
@@ -763,15 +776,4 @@ ifeq ($(T),kvm64)
 	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VDI)
 endif
 
-ifeq ($(T),sunxi-generic-ib)
-  NAME:=sunxi_imagebuilder
-  ARCH:=sunxi
-  TBUILD:=lede
-  PROFILE:=sunxi-imagebuilder
-  override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1
-  MPNAME:=
-  IMAGE:=LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-$(ARCH)-x86_64.tar.bz2
-endif
-
-
 DEVPKG ?= CONFIG_TARGET_DEVICE_PACKAGES_$(ARCH)_$(SUBARCH)_DEVICE_$(DEVICE)=$PROFILE