diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-01-02 19:39:48 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-01-02 19:39:48 +0000 |
| commit | 26923fcad450090e65e0fca74a0532fbea3ae458 (patch) | |
| tree | ec1017dd159196314b0c49e2e4586a5eb4b148f9 /conf | |
| parent | 1c0f065147987103a23908fcdc954834df3dad5f (diff) | |
| parent | 4cfc3d5ccd4cd3dc572958bdad127856be41cb2c (diff) | |
merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
and '8571d11847894fe4e419cfb25c5ae5accc13e3aa'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 3 | ||||
| -rw-r--r-- | conf/machine/include/qemu.conf | 3 | ||||
| -rw-r--r-- | conf/machine/qemuarm.conf | 2 | ||||
| -rw-r--r-- | conf/machine/qemux86.conf | 17 |
4 files changed, 20 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index e63dc61a48..d1541509c5 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -3,9 +3,6 @@ require conf/distro/angstrom-2007.1.conf #this is a special version of angstrom for armv4 based machines that can't do EABI #see http://wiki.debian.org/ArmEabiPort for details on that -#set compatible machine so people don't 'accidentally' use this -COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)" - #only glibc based builds are supported ATM TARGET_OS = "linux" 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" |