commit 59f8a97748f8ce80ed8c8e431e0b8b5199771698
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Fri Dec 9 11:14:10 2016 +0100

    [multiprofile] Add x86-64 mptarget and 64 bits versions of VBox, KVM, VMware

diff --git a/configs/x86-64-imagebuilder b/configs/x86-64-imagebuilder
deleted file mode 100644
index d8b0cd6..0000000
--- a/configs/x86-64-imagebuilder
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TARGET_x86=y
-CONFIG_TARGET_x86_64=y
-CONFIG_ALL=y
diff --git a/configs/x86-64-multiprofile b/configs/x86-64-multiprofile
new file mode 100644
index 0000000..8b5d1d6
--- /dev/null
+++ b/configs/x86-64-multiprofile
@@ -0,0 +1,67 @@
+CONFIG_TARGET_x86=y
+CONFIG_TARGET_x86_64=y
+CONFIG_TARGET_IMAGES_GZIP=n
+CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_ROOTFS_SQUASHFS=y
+CONFIG_VDI_IMAGES=y
+CONFIG_VMDK_IMAGES=y
+CONFIG_GRUB_IMAGES=y
+CONFIG_PACKAGE_qmp-big-node=y
+CONFIG_PACKAGE_kmod-ath9k=y
+CONFIG_PACKAGE_kmod-ath5k=y
+CONFIG_PACKAGE_kmod-ath9k-htc=y
+CONFIG_PACKAGE_kmod-ath10k=y
+CONFIG_PACKAGE_kmod-mt76=y
+CONFIG_PACKAGE_kmod-scsi-core=y
+CONFIG_PACKAGE_kmod-ip6tables=y
+CONFIG_PACKAGE_kmod-ipt-conntrack=y
+CONFIG_PACKAGE_kmod-ipt-core=y
+CONFIG_PACKAGE_kmod-ipt-nat=y
+CONFIG_PACKAGE_kmod-ipt-nathelper=y
+CONFIG_PACKAGE_kmod-3c59x=y
+CONFIG_PACKAGE_kmod-8139cp=y
+CONFIG_PACKAGE_kmod-8139too=y
+CONFIG_PACKAGE_kmod-atl1=y
+CONFIG_PACKAGE_kmod-atl2=y
+CONFIG_PACKAGE_kmod-b44=y
+CONFIG_PACKAGE_kmod-dm9000=y
+CONFIG_PACKAGE_kmod-e100=y
+CONFIG_PACKAGE_kmod-e1000=y
+CONFIG_PACKAGE_kmod-e1000e=y
+CONFIG_PACKAGE_kmod-et131x=y
+CONFIG_PACKAGE_kmod-libphy=y
+CONFIG_PACKAGE_kmod-mii=y
+CONFIG_PACKAGE_kmod-natsemi=y
+CONFIG_PACKAGE_kmod-ne2k-pci=y
+CONFIG_PACKAGE_kmod-pcnet32=y
+CONFIG_PACKAGE_kmod-r8169=y
+CONFIG_PACKAGE_kmod-sis190=y
+CONFIG_PACKAGE_kmod-sis900=y
+CONFIG_PACKAGE_kmod-tg3=y
+CONFIG_PACKAGE_kmod-via-rhine=y
+CONFIG_PACKAGE_kmod-via-velocity=y
+CONFIG_PACKAGE_kmod-bridge=y
+CONFIG_PACKAGE_kmod-gre=y
+CONFIG_PACKAGE_kmod-gre6=y
+CONFIG_PACKAGE_kmod-ip6-tunnel=y
+CONFIG_PACKAGE_kmod-ipip=y
+CONFIG_PACKAGE_kmod-iptunnel=y
+CONFIG_PACKAGE_kmod-iptunnel4=y
+CONFIG_PACKAGE_kmod-iptunnel6=y
+CONFIG_PACKAGE_kmod-llc=y
+CONFIG_PACKAGE_kmod-ppp=y
+CONFIG_PACKAGE_kmod-pppoe=y
+CONFIG_PACKAGE_kmod-pppox=y
+CONFIG_PACKAGE_kmod-slhc=y
+CONFIG_PACKAGE_kmod-stp=y
+CONFIG_PACKAGE_kmod-tun=y
+CONFIG_PACKAGE_kmod-pps=y
+CONFIG_PACKAGE_kmod-ptp=y
+CONFIG_PACKAGE_kmod-ssb=y
+CONFIG_PACKAGE_kmod-usb-core=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-usb2-pci=y
+CONFIG_PACKAGE_usb-modeswitch=y
diff --git a/targets.mk b/targets.mk
index 07f1af6..694aa51 100644
--- a/targets.mk
+++ b/targets.mk
@@ -39,8 +39,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
-HW_AVAILABLE := alfa-nx alix bullet cf-wr800n dir-810l dragino2 kvm 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 unifi-ap vbox vmware vocore-16M vocore-8M wl-wn575a3 wpe72-8M wrtnode wt1520-4M wt1520-8M wt3020-4M wt3020-8M x86 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 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 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
 
 ifeq ($(MPT),ath25-generic)
   TBUILD:=lede
@@ -165,6 +165,17 @@ ifeq ($(MPT),x86-geode)
   BIG:=
 endif
 
+#This architecture is not really multi-profile, but generates all images
+ifeq ($(MPT),x86-64)
+  TBUILD:=lede
+  ARCH:=x86
+  SUBARCH:=64
+  DEVPKG:=
+  TINY:=
+  SMALL:=
+  BIG:=
+endif
+
 ifeq ($(T),alfa-nx)
   NAME:=Alfa-Network_N5
   ARCH:=ar71xx
@@ -195,6 +206,16 @@ ifeq ($(T),x86)
 	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4IMG)
 endif
 
+ifeq ($(T),x86-64)
+  NAME:=Generic_x86-64
+  ARCH:=x86
+  SUBARCH:=64
+  TBUILD:=lede
+  MPNAME:=x86
+	SQUASHIMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASHIMG)
+	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4IMG)
+endif
+
 ifeq ($(T),soekris45xx)
   NAME:=Soekris_Net45xx
   ARCH:=x86
@@ -553,6 +574,16 @@ ifeq ($(T),vbox)
 	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VDI)
 endif
 
+ifeq ($(T),vbox64)
+  NAME:=VirtualBox_x86-64
+  ARCH:=x86
+  SUBARCH:=64
+  TBUILD:=lede
+  MPNAME:=vbox
+	SQUASHIMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASHVDI)
+	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VDI)
+endif
+
 ifeq ($(T),vmware)
   NAME:=VMware_x86
   ARCH:=x86
@@ -563,6 +594,16 @@ ifeq ($(T),vmware)
 	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VMDK)
 endif
 
+ifeq ($(T),vmware64)
+  NAME:=VMware_x86-64
+  ARCH:=x86
+  TBUILD:=lede
+  SUBARCH:=64
+  MPNAME:=vmware
+	SQUASHIMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASHVMDK)
+	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VMDK)
+endif
+
 ifeq ($(T),vocore-8M)
   NAME:=Vonger_VoCore-8M
   ARCH:=ramips
@@ -694,6 +735,16 @@ ifeq ($(T),kvm)
 	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VDI)
 endif
 
+ifeq ($(T),kvm64)
+  NAME:=KVM_x86-64
+  ARCH:=x86
+  SUBARCH:=64
+  TBUILD:=lede
+  MPNAME:=kvm
+	SQUASHIMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDSQUASHVDI)
+	EXT4IMAGE:=$(DISTCL)-$(ARCH)-$(SUBARCH)-$(COMBINEDEXT4VDI)
+endif
+
 ifeq ($(T),sunxi-generic-ib)
   NAME:=sunxi_imagebuilder
   ARCH:=sunxi