2 files changed, 4 insertions, 4 deletions

diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 90a13871fc..705caf0886 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -13,7 +13,7 @@ XSERVER = "xserver-kdrive-xomap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/tune-arm926ejs.inc
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
@@ -29,6 +29,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat"
 MACHINE_EXTRA_RDEPENDS = "usbinit"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
diff --git a/meta/conf/machine/nokia800.conf b/meta/conf/machine/nokia800.conf
index 3cd410545e..9217827591 100644
--- a/meta/conf/machine/nokia800.conf
+++ b/meta/conf/machine/nokia800.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 800
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
 XSERVER = "xserver-kdrive-xomap"
@@ -24,6 +24,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat"
 MACHINE_EXTRA_RDEPENDS = "cx3110x"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"