8 files changed, 36 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index e63dc61a48..d1541509c5 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -3,9 +3,6 @@ require conf/distro/angstrom-2007.1.conf
 #this is a special version of angstrom for armv4 based machines that can't do EABI
 #see http://wiki.debian.org/ArmEabiPort for details on that
 
-#set compatible machine so people don't 'accidentally' use this 
-COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)"
-
 #only glibc based builds are supported ATM
 TARGET_OS = "linux"
 
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 2904db1108..d33ae96c68 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -103,6 +103,11 @@ kernel-module-libata \
 kernel-module-pata-artop \
 "
 
+# Add modules required for Network support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 8634d091f0..1091aa2e98 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -103,6 +103,11 @@ kernel-module-libata \
 kernel-module-pata-artop \
 "
 
+# Add modules required for Network support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index fe3cdbc481..1c3ae63025 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -20,6 +20,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
 
+#the a780 needs a userspace daemon to stop the BP from shutting down the phone 
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
 ROOT_FLASH_SIZE = "24"
 
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
index b314fa9bea..26b78a6a9d 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.conf
@@ -7,4 +7,5 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
 IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
-ROOT_FLASH_SIZE = "100"
+ROOT_FLASH_SIZE = "200"
+IMAGE_ROOTFS_SIZE_ext2 = "200000"
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index 347c7ba3fb..d3fcd2b017 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -5,7 +5,9 @@
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
 ARCH_BYTE_SEX = "le"
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
+require conf/machine/include/tune-xscale.conf
+
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 371ba927bb..2de34e42c9 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
-MACHINE_TASK_PROVIDER = "task-base"
-\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
new file mode 100644
index 0000000000..dfbd345ae8
--- /dev/null
+++ b/conf/machine/qemux86.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: qemu x86 Emulator setup
+#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86"
+
+require conf/machine/include/qemu.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_TASK_PROVIDER = "task-base"