merge of 425cf1b391611c169a1c3b78f1fe86df088902b9

[vuplus_openembedded] / conf / machine / nokia770.conf

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 7b9a24b..de53f3c 100644 (file)
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,56 +2,35 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
 
 XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-arm926ejs.conf
 
-
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
-EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
+EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
+
+IMAGE_FSTYPES ?= "jffs2"
 
 # serial console port on devboard rev. B3
-#SERIAL_CONSOLE = "115200 tts/0"
 SERIAL_CONSOLE = "115200 ttyS0"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 
-#build omap1 till nokia releases the patches
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
-pcmcia-cs apm  ppp wireless-tools console-tools"
-
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 "
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
-# PPP Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
-
-#USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
-#                                                       kernel-module-g-ether"
-
+#use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-include conf/machine/include/handheld-common.conf
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
+MACHINE_TASK_PROVIDER = "task-base"