summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-01-02 11:55:13 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-01-02 11:55:13 +0000
commit8fdeaa274d4816df1ba2a9277df475d613082536 (patch)
tree721179aa4a1c19ef8951bd880a13e1d8ea87c4fc /conf
parent482eefa6315f8a521e841bc3d3242d92118b41f1 (diff)
Add qemux86.conf from Poky (and update qemu rootfs sizes)
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/qemu.conf3
-rw-r--r--conf/machine/qemuarm.conf2
-rw-r--r--conf/machine/qemux86.conf17
3 files changed, 20 insertions, 2 deletions
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
index b314fa9bea..26b78a6a9d 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.conf
@@ -7,4 +7,5 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
IMAGE_FSTYPES ?= "tar.bz2 ext2"
-ROOT_FLASH_SIZE = "100"
+ROOT_FLASH_SIZE = "200"
+IMAGE_ROOTFS_SIZE_ext2 = "200000"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 371ba927bb..2de34e42c9 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
new file mode 100644
index 0000000000..dfbd345ae8
--- /dev/null
+++ b/conf/machine/qemux86.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: qemu x86 Emulator setup
+#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86"
+
+require conf/machine/include/qemu.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_TASK_PROVIDER = "task-base"