Index: target/linux/x86-2.6/image/files/openwrt.vmx
===================================================================
--- target/linux/x86-2.6/image/files/openwrt.vmx	(revision 0)
+++ target/linux/x86-2.6/image/files/openwrt.vmx	(revision 0)
@@ -0,0 +1,104 @@
+#!/usr/bin/vmplayer
+
+# Filename: OpenWrt_Kamikaze.vmx
+# Generated 2007-01-30;00:42:49 by EasyVMX!
+# http://www.easyvmx.com
+
+# This is a Workstation 5 or 5.5 config file
+# It can be used with Player
+config.version = "8"
+virtualHW.version = "3"
+
+# Selected operating system for your virtual machine
+guestOS = "other26xlinux"
+
+# displayName is your own name for the virtual machine
+displayName = "OpenWrt Kamikaze (x86-2.6)"
+
+# These fields are free text description fields
+guestinfo.vmware.product.url = "http://www.easyvmx.com/"
+guestinfo.vmware.product.class = "virtual machine"
+
+# Number of virtual CPUs. Your virtual machine will not
+# work if this number is higher than the number of your physical CPUs
+numvcpus = "1"
+
+# Memory size and other memory settings
+memsize = "128"
+MemAllowAutoScaleDown = "FALSE"
+MemTrimRate = "-1"
+
+# Unique ID for the virtual machine will be created
+uuid.action = "create"
+
+# Remind to install VMware Tools
+# This setting has no effect in VMware Player
+tools.remindInstall = "TRUE"
+
+# Startup hints interfers with automatic startup of a virtual machine
+# This setting has no effect in VMware Player
+hints.hideAll = "TRUE"
+
+# Enable time synchronization between computer
+# and virtual machine
+tools.syncTime = "TRUE"
+
+# First serial port, physical COM1 is available
+serial0.present = "TRUE"
+serial0.fileType = "pipe"
+serial0.fileName = "\\.\pipe\com_1"
+serial0.tryNoRxLoss = "TRUE"
+serial0.pipe.endPoint = "server"
+
+# Optional second serial port, physical COM2 is not available
+serial1.present = "FALSE"
+
+# First parallell port, physical LPT1 is not available
+parallel0.present = "FALSE"
+
+# Logging
+# This config activates logging, and keeps last log
+logging = "FALSE"
+log.fileName = "OpenWrt_Kamikaze.log"
+log.append = "TRUE"
+log.keepOld = "1"
+
+# These settings decides interaction between your
+# computer and the virtual machine
+isolation.tools.hgfs.disable = "FALSE"
+isolation.tools.dnd.disable = "FALSE"
+isolation.tools.copy.enable = "TRUE"
+isolation.tools.paste.enabled = "TRUE"
+
+# First network interface card
+ethernet0.present = "TRUE"
+ethernet0.virtualDev = "e1000"
+ethernet0.connectionType = "bridged"
+ethernet0.addressType = "generated"
+ethernet0.generatedAddressOffset = "0"
+
+# Second network interface card
+ethernet1.present = "TRUE"
+ethernet1.virtualDev = "e1000"
+ethernet1.connectionType = "bridged"
+ethernet1.addressType = "generated"
+ethernet1.generatedAddressOffset = "10"
+
+# Settings for physical floppy drive
+floppy0.present = "FALSE"
+
+# Settings for physical CDROM drive
+ide1:0.present = "TRUE"
+ide1:0.deviceType = "cdrom-raw"
+ide1:0.startConnected = "FALSE"
+ide1:0.fileName = "auto detect"
+ide1:0.autodetect = "TRUE"
+
+# First IDE disk
+ide0:0.present = "TRUE"
+ide0:0.fileName = "openwrt-x86-2.6-ext2.vmdk"
+ide0:0.mode = "persistent"
+ide0:0.startConnected = "TRUE"
+ide0:0.writeThrough = "TRUE"
+
+# END OF EasyVMX! CONFIG
Index: target/linux/x86-2.6/image/Makefile
===================================================================
--- target/linux/x86-2.6/image/Makefile	(revision 6256)
+++ target/linux/x86-2.6/image/Makefile	(working copy)
@@ -45,6 +45,9 @@
 		-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
 		./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
 	PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+
+	# copy VMX configuration file to $(BIN_DIR)
+	$(CP) ./files/openwrt.vmx $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).vmx
   endef
 endif
 
@@ -69,6 +72,11 @@
 	$(call Image/Build/grub,$(1))
 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs
 	$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
+
+	# create .vmdk image for vmware
+	# check if qemu-img exists????
+	qemu-img convert -f raw $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image \
+		-O vmdk $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).vmdk
 endef
 
 $(eval $(call BuildImage))
Index: target/linux/x86-2.6/Makefile
===================================================================
--- target/linux/x86-2.6/Makefile	(revision 6256)
+++ target/linux/x86-2.6/Makefile	(working copy)
@@ -11,8 +11,40 @@
 BOARDNAME:=x86
 FEATURES:=jffs2 ext2
 
+define Target/Description
+	Build images for X86 architecture.
+	E. g. for Soekris net4801 or VMware image
+endef
+
 include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += kmod-natsemi
+DEFAULT_PACKAGES:=$(filter-out mtd,$(DEFAULT_PACKAGES))
 
+define Profile/net4801
+  NAME:=Soekris net4801 and compatible routers
+  PACKAGES:=kmod-natsemi
+endef
+
+define Profile/net4801/Description
+	blabla
+endef
+$(eval $(call Profile,net4801))
+
+define Profile/vmware
+  NAME:=VMware image
+  PACKAGES:=kmod-e1000
+endef
+
+define Profile/vmware/Description
+	Creates VMDK images for use with VMware and VMware Player. Open the
+	openwrt-x86-2.6-ext2.vmx file to start OpenWrt Kamikaze.
+	Once the VM is up you can connect to the VMware's serial console at
+	\\.\pipe\com_1 using PuTTY or with telnet at 192.168.1.1 (if the network
+	is correctly configured on the Windows host-system).
+	
+	The VMX (VMware configuration file) is optimized for Windows.
+	
+	Download the free VMware Player from http://http://www.vmware.com/
+endef
+$(eval $(call Profile,vmware))
+
 $(eval $(call BuildKernel))
-