Add emulator config files

- build for x86, similar to qemu
- use direct disk image type for virtualbox

Change-Id: I4fa29d3efc9c3f0e1dd1cede405bb2efa9cff133
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

7 files changed, 55 insertions, 9 deletions

diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
new file mode 100644
index 0000000..fc76234
--- /dev/null
+++ b/classes/image-hdd.bbclass
@@ -0,0 +1,22 @@
+# need to define the dependency and the ROOTFS for directdisk
+do_bootdirectdisk[depends] += "${PN}:do_rootfs"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+
+SYSLINUX_ROOT = "root=/dev/hda2 "
+SYSLINUX_PROMPT = "0"
+SYSLINUX_TIMEOUT = "1"
+SYSLINUX_LABELS = "boot"
+LABELS_append = " ${SYSLINUX_LABELS} "
+
+inherit image_types boot-directdisk
+
+create_hdd_image () {
+        ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+}
+
+python do_hddimg() {
+        bb.build.exec_func('create_hdd_image', d)
+}
+
+addtask hddimg after do_bootdirectdisk before do_build
+do_hddimg[nostamp] = "1"
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index 64b7726..7b11482 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -1,5 +1,8 @@
 inherit image_types_fsl
 
+IMAGE_ROOTFS_EXTRA_SPACE = "300000"
+SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+
 IMAGE_CMD_sdcard_append () {
     parted -s ${SDCARD} set 1 boot on
 }
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 8586774..4932436 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -1,4 +1,5 @@
-include conf/distro/include/image_type.conf
+IMAGE_CLASSES += "image_types_sdcard"
+IMAGE_FSTYPES = "tar.gz ext3 sdcard"
 
 BOOT_SCRIPTS = "\
         u-boot-${MACHINE}.img:u-boot.img \
@@ -10,4 +11,3 @@ UBOOT_SUFFIX = "img"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
-
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
new file mode 100644
index 0000000..fdef2f3
--- /dev/null
+++ b/conf/distro/include/emulator.conf
@@ -0,0 +1,4 @@
+IMAGE_CLASSES += "image-hdd"
+IMAGE_ROOTFS_ALIGNMENT = "1048576"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+IMAGE_FSTYPES = "ext3"
diff --git a/conf/distro/include/image_type.conf b/conf/distro/include/image_type.conf
deleted file mode 100644
index b98fdd1..0000000
--- a/conf/distro/include/image_type.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
-IMAGE_CLASSES += "image_types_sdcard"
-
-IMAGE_ROOTFS_EXTRA_SPACE = "300000"
-SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 7bfb8c2..e232667 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -1,4 +1,5 @@
-include conf/distro/include/image_type.conf
+IMAGE_CLASSES += "image_types_sdcard"
+IMAGE_FSTYPES = "tar.gz ext3 sdcard"
 
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
new file mode 100644
index 0000000..e118a44
--- /dev/null
+++ b/conf/machine/emulator.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: virtual box emulator
+#@DESCRIPTION: Machine configuration for running a common x86
+
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.8%"
+
+require conf/machine/include/tune-i586.inc
+
+KERNEL_IMAGETYPE = "bzImage"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_FEATURES += "x86"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
+
+MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"