summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/nokia770.conf8
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 7 insertions, 5 deletions
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 6cc73c9232..2e22771e4a 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -12,7 +12,6 @@ XSERVER = "xserver-kdrive-omap"
12 12
13# 800x480 is big enough for me 13# 800x480 is big enough for me
14GUI_MACHINE_CLASS = "bigscreen" 14GUI_MACHINE_CLASS = "bigscreen"
15GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
16 15
17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 16# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
18include conf/machine/include/tune-arm926ejs.conf 17include conf/machine/include/tune-arm926ejs.conf
@@ -28,11 +27,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
28 27
29PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" 28PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
30 29
31#BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ 30#use this if you are using the nokia initfs
32#${PCMCIA_MANAGER} apm ppp wireless-tools console-tools"
33
34
35ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " 31ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
36 32
37MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" 33MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
38MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" 34MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
35
36MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 2affa6693f..d67acac50f 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -11,3 +11,5 @@ require conf/machine/include/tune-arm926ejs.conf
11SERIAL_CONSOLE = "115200 ttyAMA0" 11SERIAL_CONSOLE = "115200 ttyAMA0"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 13PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
14
15MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 63e318908e..8b7b541f00 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,3 +15,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
15 15
16GLIBC_ADDONS = "nptl" 16GLIBC_ADDONS = "nptl"
17GLIBC_EXTRA_OECONF = "--with-tls" 17GLIBC_EXTRA_OECONF = "--with-tls"
18
19MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file