commit 59b4c27ee898118dcd448b6a190afd76af1c335e
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Fri Nov 18 18:00:40 2016 +0100

    [Multiprofile] Migrate Alix/x86-geode to multiprofile

diff --git a/Makefile b/Makefile
index 702ef2b..6c6cede 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ endef
 define copy_config_mptarget
 	$(if $(T),@echo "Using multi-profile $(ARCH)-$(SUBARCH) for target $(T)", @echo "Using multi-profile $(MPT)")
 
-	cp -f $(CONFIG_DIR)/$(ARCH)-$(SUBARCH)-multiprofile $(CONFIG) || echo "WARNING: Config file not found!"
+	@cp -f $(CONFIG_DIR)/$(ARCH)-$(SUBARCH)-multiprofile $(CONFIG) || echo "WARNING: Config file not found!"
 	@for DEVICE in $(TINY); do \
 		echo $(DEVPKG)$$DEVICE=\"$(TINYPKG)\" >> $(CONFIG) ;\
 	done
diff --git a/configs/targets/alix b/configs/targets/alix
deleted file mode 100644
index 1ec3dd9..0000000
--- a/configs/targets/alix
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_TARGET_x86_geode=y
-CONFIG_PACKAGE_kmod-ipip=y
-CONFIG_PACKAGE_kmod-usb-ohci=y
-CONFIG_PACKAGE_kmod-usb-storage=y
-CONFIG_PACKAGE_kmod-usb-uhci=y
-CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-rt2800-usb=y
diff --git a/configs/x86-geode-imagebuilder b/configs/x86-geode-imagebuilder
deleted file mode 100644
index 2c6a65a..0000000
--- a/configs/x86-geode-imagebuilder
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TARGET_x86=y
-CONFIG_TARGET_x86_geode=y
-CONFIG_ALL=y
diff --git a/configs/x86-geode-multiprofile b/configs/x86-geode-multiprofile
new file mode 100644
index 0000000..aa6594f
--- /dev/null
+++ b/configs/x86-geode-multiprofile
@@ -0,0 +1,11 @@
+CONFIG_TARGET_x86=y
+CONFIG_TARGET_x86_geode=y
+CONFIG_PACKAGE_qmp-big-node=y
+CONFIG_PACKAGE_kmod-usb2=y
+CONFIG_PACKAGE_kmod-usb-ohci=y
+CONFIG_PACKAGE_kmod-usb-storage=y
+CONFIG_PACKAGE_kmod-usb-uhci=y
+CONFIG_PACKAGE_kmod-ath9k-htc=y
+CONFIG_PACKAGE_kmod-rt2800-usb=y
+CONFIG_PACKAGE_kmod-ipip=y
+CONFIG_PACKAGE_ipip=y
diff --git a/targets.mk b/targets.mk
index ecc02c8..1378b73 100644
--- a/targets.mk
+++ b/targets.mk
@@ -33,8 +33,8 @@ TBUILD_LIST := lede
 
 DISTLEGACY:=lede
 
-MP_AVAILABLE := ath25-generic ar71xx-generic brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x
-HW_AVAILABLE := alfa-nx bullet kvm nsm2 nsm5 nsm5-xw nslm5-xw rocket-m-xw pico2 rocket-m rs rspro mc-mac1200r tl-2543-v1 tl-wr703n-v1 tl-wr743nd-v1 tl-wr841-v7 tl-wr841-v8 tl-wr841-v9 tl-wr841-v10 tl-842n-v1 tl-mr3020-v1 tl-mr3040-v1 tl-wa7510n tl-wdr3500-v1 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 wpe72-8M dragino2 alix soekris45xx x86 uap-pro unifi-ap vbox vmware vocore-8M vocore-16M wt1520-4M wt1520-8M cf-wr800n dir-810l microwrt miwifi-mini wl-wn575a3 wrtnode wt3020-4M wt3020-8M zbt-ape522ii lamobo-r1 mpc85xx-generic-ib sunxi-generic-ib x86-generic-ib x86-geode-ib
+MP_AVAILABLE := ath25-generic ar71xx-generic brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x x86-geode
+HW_AVAILABLE := alfa-nx bullet kvm nsm2 nsm5 nsm5-xw nslm5-xw rocket-m-xw pico2 rocket-m rs rspro mc-mac1200r tl-2543-v1 tl-wr703n-v1 tl-wr743nd-v1 tl-wr841-v7 tl-wr841-v8 tl-wr841-v9 tl-wr841-v10 tl-842n-v1 tl-mr3020-v1 tl-mr3040-v1 tl-wa7510n tl-wdr3500-v1 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 wpe72-8M dragino2 alix soekris45xx x86 uap-pro unifi-ap vbox vmware vocore-8M vocore-16M wt1520-4M wt1520-8M cf-wr800n dir-810l microwrt miwifi-mini wl-wn575a3 wrtnode wt3020-4M wt3020-8M zbt-ape522ii lamobo-r1 mpc85xx-generic-ib sunxi-generic-ib x86-generic-ib
 
 ifeq ($(MPT),ath25-generic)
   TBUILD:=lede
@@ -126,12 +126,21 @@ ifeq ($(MPT),ramips-rt305x)
   BIG:=
 endif
 
+ifeq ($(MPT),x86-geode)
+  TBUILD:=lede
+  ARCH:=x86
+  SUBARCH:=geode
+  DEVPKG:=CONFIG_TARGET_DEVICE_PACKAGES_$(ARCH)_$(SUBARCH)_DEVICE_
+  TINY:=
+  SMALL:=
+  BIG:=
+endif
+
 ifeq ($(T),alfa-nx)
   NAME:=Alfa-Network_N5
   ARCH:=ar71xx
   SUBARCH:=generic
   TBUILD:=lede
-  PROFILE:=qmp-small-node
   MPNAME:=ALFANX
   FACTORY:=$(DISTLEGACY)-$(ARCH)-$(SUBARCH)-$(T)-$(SQUASHFACTORY)
   SYSUPGRADE:=$(DISTLEGACY)-$(ARCH)-$(SUBARCH)-$(T)-$(SQUASHSYSUPGRADE)
@@ -142,8 +151,7 @@ ifeq ($(T),alix)
   ARCH:=x86
   SUBARCH:=geode
   TBUILD:=lede
-  PROFILE:=x86-qmp-big-node
-  MPNAME:=
+  MPNAME:=x86-geode
   COMBINEDSQUASH:=combined-squashfs.img
   FACTORY:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASH)
   SYSUPGRADE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASH)
@@ -730,17 +738,6 @@ ifeq ($(T),x86-generic-ib)
   IMAGE:=LEDE-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImageBuilder-qMp-$(ARCH)-x86_64.tar.bz2
 endif
 
-ifeq ($(T),x86-geode-ib)
-  NAME:=x86_geode_imagebuilder
-  ARCH:=x86
-  SUBARCH:=geode
-  TBUILD:=lede
-  PROFILE:=x86-geode-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
-
 ifeq ($(T),x86-64-ib)
   NAME:=x86_64_imagebuilder
   ARCH:=x86