summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/qemu.conf10
-rw-r--r--meta/conf/machine/qemuarm.conf14
-rw-r--r--meta/conf/machine/qemux86.conf17
3 files changed, 29 insertions, 12 deletions
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
new file mode 100644
index 0000000000..8587c2ab2f
--- /dev/null
+++ b/meta/conf/machine/include/qemu.conf
@@ -0,0 +1,10 @@
1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_xserver = "xserver-kdrive"
3GUI_MACHINE_CLASS = "bigscreen"
4GPE_EXTRA_INSTALL += "gaim sylpheed"
5
6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
7
8IMAGE_FSTYPES ?= "tar.bz2"
9
10ROOT_FLASH_SIZE = "100"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index cc4daa491f..a64a58e9a2 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -5,19 +5,9 @@
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_EXTRA_ARCHS = "armv4 armv5te" 6IPKG_EXTRA_ARCHS = "armv4 armv5te"
7 7
8PCMCIA_MANAGER = "pcmciautils" 8require conf/machine/include/qemu.conf
9PREFERRED_PROVIDER_xserver = "xserver-kdrive" 9require conf/machine/include/tune-arm926ejs.conf
10GUI_MACHINE_CLASS = "bigscreen"
11GPE_EXTRA_INSTALL += "gaim sylpheed"
12
13include conf/machine/include/tune-arm926ejs.conf
14 10
15SERIAL_CONSOLE = "115200 ttyAMA0" 11SERIAL_CONSOLE = "115200 ttyAMA0"
16 12
17PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 13PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
18
19MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
20
21IMAGE_FSTYPES ?= "tar.bz2"
22
23ROOT_FLASH_SIZE = "100"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
new file mode 100644
index 0000000000..340ad812c7
--- /dev/null
+++ b/meta/conf/machine/qemux86.conf
@@ -0,0 +1,17 @@
1#@TYPE: Machine
2#@NAME: qemu x86 Emulator setup
3#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
4
5TARGET_ARCH = "i586"
6TARGET_VENDOR = "-oe"
7IPKG_EXTRA_ARCHS = "x86"
8
9require conf/machine/include/qemu.conf
10# require conf/machine/include/tune-arm926ejs.conf
11
12SERIAL_CONSOLE = "115200 ttyS0"
13
14PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
15
16GLIBC_ADDONS = "nptl"
17GLIBC_EXTRA_OECONF = "--with-tls"