merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'

     and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'

32 files changed, 30 insertions, 41 deletions

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index bfa8ace376..c9cfe7744f 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -23,5 +23,4 @@ require conf/machine/include/tune-strongarm.conf
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 4febd8939e..378ab20e43 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -27,5 +27,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000;\
 	"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 468c2ebd7d..c7266fee00 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -21,5 +21,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 5acdb24ba6..268b2a361c 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -8,7 +8,6 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 ext2"
-MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.12"
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 2e3524c522..ca1a7be8ff 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -9,7 +9,6 @@ PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc603e"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #don't try to access tty1
 USE_VT = "0"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index dcf3409723..f10797bbaf 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -23,8 +23,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-ext2 \
   alsa-state"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 # used by sysvinit_2
 #SERIAL_CONSOLE = "115200 ttySAC0"
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index a440078cb7..953c90590d 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -24,8 +24,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
                              kernel-module-micro"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index dbe3a5a010..980fc0e2eb 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -16,7 +16,6 @@ require conf/machine/include/tune-xscale.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #
 # Software/packages selection
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
index eab879368c..f22ffce6c2 100644
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.conf
@@ -1,4 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
+
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
index 161f3ad8c1..064db79b29 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -7,7 +7,6 @@ TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
 TARGET_FPU = "hard"
-MACHINE_TASK_PROVIDER = "task-base"
 
 USE_DEVFS = "0"
 
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
index 1f3313c9b5..98f8cbdded 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -38,6 +38,5 @@ MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index a12328b993..40d3848df7 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -10,4 +10,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen"
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 74a94bdfcf..f08fb6f253 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -10,4 +10,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 435014ac5c..f4dd576653 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -25,5 +25,4 @@ ROOT_FLASH_SIZE = "32"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
index 9698fc9a70..15477f59c6 100644
--- a/conf/machine/lsarm.conf
+++ b/conf/machine/lsarm.conf
@@ -12,8 +12,6 @@ TARGET_FPU = "soft"
 
 PREFERRED_PROVIDER_virtual/bootloader = ""
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 USE_DEVFS = "0"
 
 require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 6303a8e96a..291c68ebd2 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -18,5 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 11ec87d205..f275d617de 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -12,7 +12,6 @@ MODUTILS=26
 MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
-MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 65a797c680..e7aeab7389 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -13,8 +13,6 @@ XSERVER = "xserver-kdrive-vesa"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
 ROOT_FLASH_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index f7e05e768b..2b66d6c921 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -32,5 +32,3 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
new file mode 100644
index 0000000000..fd1486e752
--- /dev/null
+++ b/conf/machine/nokia800.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: Nokia 770 internet tablet
+#@DESCRIPTION: Machine configuration for the Nokia 800
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
+XSERVER = "xserver-kdrive-xomap"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+include conf/machine/include/tune-arm1136jf-s.conf
+
+ROOT_FLASH_SIZE = "174"
+EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+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_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index ac73b90571..946a619d3f 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -20,8 +20,6 @@ ROOT_FLASH_SIZE = "29"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-ide-disk \
                           kernel-module-ide-core \
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 2de34e42c9..1742e1b1aa 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -11,5 +11,3 @@ require conf/machine/include/tune-arm926ejs.conf
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index dfbd345ae8..60aa12ad7f 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -13,5 +13,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index 648d4eae9f..61bec7f6f2 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -20,5 +20,4 @@ require conf/machine/include/tune-strongarm.conf
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index f99d509c86..8e2cc276d8 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -6,7 +6,6 @@ MACHINE_KERNEL_VERSION ?= "2.4"
 
 TARGET_ARCH = "arm"
 
-MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf
index f2064175fd..903685e8dd 100644
--- a/conf/machine/smdk2440.conf
+++ b/conf/machine/smdk2440.conf
@@ -13,7 +13,6 @@ SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "tar.gz"
 
-MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES = "kernel26 apm screen"
 
 require conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
index 535846c731..0f7419f80b 100644
--- a/conf/machine/smdk2443.conf
+++ b/conf/machine/smdk2443.conf
@@ -13,7 +13,6 @@ SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "tar.gz"
 
-MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES = "kernel26 apm screen"
 
 require conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index ea59349c07..0898da1520 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -12,7 +12,6 @@ USE_VT="0"
 MODUTILS=26
 MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
-MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
index a7ce106356..bbf1e23b15 100644
--- a/conf/machine/titan.conf
+++ b/conf/machine/titan.conf
@@ -26,7 +26,6 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "63984"
 
 # Things to include in the fs image
 MACHINE_FEATURES = "kernel26 pci ext2 usbhost"
-MACHINE_TASK_PROVIDER = "task-base"
 # The kernel and lilo-sh need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel lilo-sh"
 
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 0911dd39af..33e0427a8e 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -17,7 +17,6 @@ UBOOT_MACHINE = "qnap_config"
 PREFERRED_VERSION_u-boot = "1.2.0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
-MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index e0c65475f6..34d6775932 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -23,7 +23,6 @@ IMAGE_FSTYPE ?= "tar.gz"
 
 # Things to include in the fs image
 MACHINE_FEATURES = "kernel26 pci ext2"
-MACHINE_TASK_PROVIDER = "task-base"
 # The kernel and grub need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel grub"
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 5b22d01324..e0d4cc96a2 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
 
 udevdir = "/dev"