summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/cmx270.conf6
-rw-r--r--meta/conf/machine/qemuarm.conf25
2 files changed, 3 insertions, 28 deletions
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index d35ca0430a..ad560db630 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -1,6 +1,6 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: Nokia 770 internet tablet 2#@NAME: Nokia 770 internet tablet
3#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet 3#@DESCRIPTION: Machine configuration for the Compulab CM-X270
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5IPKG_EXTRA_ARCHS = "armv4 armv5te" 5IPKG_EXTRA_ARCHS = "armv4 armv5te"
6 6
@@ -17,7 +17,6 @@ PREFERRED_PROVIDER_virtual/bootloader = ""
17# 800x480 is big enough for me 17# 800x480 is big enough for me
18GUI_MACHINE_CLASS = "bigscreen" 18GUI_MACHINE_CLASS = "bigscreen"
19 19
20# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
21include conf/machine/include/tune-xscale.conf 20include conf/machine/include/tune-xscale.conf
22 21
23#size of the root partition (yes, it is 123 MB) 22#size of the root partition (yes, it is 123 MB)
@@ -28,6 +27,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
28 27
29PREFERRED_PROVIDER_virtual/kernel = "linux-cmx270" 28PREFERRED_PROVIDER_virtual/kernel = "linux-cmx270"
30 29
31 30MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
32include conf/machine/include/handheld-common.conf
33 31
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 40de141fd5..cc4daa491f 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -10,37 +10,14 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
10GUI_MACHINE_CLASS = "bigscreen" 10GUI_MACHINE_CLASS = "bigscreen"
11GPE_EXTRA_INSTALL += "gaim sylpheed" 11GPE_EXTRA_INSTALL += "gaim sylpheed"
12 12
13include conf/machine/include/handheld-common.conf
14include conf/machine/include/tune-arm926ejs.conf 13include conf/machine/include/tune-arm926ejs.conf
15 14
16SERIAL_CONSOLE = "115200 ttyAMA0" 15SERIAL_CONSOLE = "115200 ttyAMA0"
17 16
18PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 17PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
19 18
20BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ 19MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
21pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
22ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
23
24# Ethernet modules
25#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
26# NFS Modules
27#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
28# Crypto Modules
29#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
30# SMB and CRAMFS
31#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
32# Serial Modules
33#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
34# Bluetooth Modules
35#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
36# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
37# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
38# Infrared Modules
39#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
40# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
41 20
42IMAGE_FSTYPES ?= "tar.bz2" 21IMAGE_FSTYPES ?= "tar.bz2"
43 22
44ROOT_FLASH_SIZE = "100" 23ROOT_FLASH_SIZE = "100"
45# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
46# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte