summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 21:55:03 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 21:55:03 +0000
commit2a01021aaffde56326d0bce0bbf0bb5bfe948b58 (patch)
tree18d10eb06a2a2dddf1f1b4880fe9a507dfb7afd8 /meta
parent06a16339a3b30c944c754eb01b63f461b2d85ab6 (diff)
downloadpoky-2a01021aaffde56326d0bce0bbf0bb5bfe948b58.tar.gz
Sync conf files with OE (and add iwmmxt arch to capable machines)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@654 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/akita.conf1
-rw-r--r--meta/conf/machine/cmx270.conf2
-rw-r--r--meta/conf/machine/include/poodle-2.6.conf44
-rw-r--r--meta/conf/machine/include/tosa-2.6.conf4
-rw-r--r--meta/conf/machine/include/tune-arm920t.conf3
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.conf1
-rw-r--r--meta/conf/machine/include/tune-ep9312.conf2
-rw-r--r--meta/conf/machine/include/zaurus-clamshell-2.6.conf2
-rw-r--r--meta/conf/machine/include/zaurus-clamshell.conf2
-rw-r--r--meta/conf/machine/ipaq-pxa270.conf2
-rw-r--r--meta/conf/machine/spitz.conf1
11 files changed, 13 insertions, 51 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index c191b9031d..0358864c70 100644
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -5,6 +5,7 @@
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
7 7
8IPKG_EXTRA_ARCHS += "iwmmxt"
8IMAGE_FSTYPES ?= "jffs2" 9IMAGE_FSTYPES ?= "jffs2"
9 10
10ROOT_FLASH_SIZE = "58" 11ROOT_FLASH_SIZE = "58"
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index ad560db630..9fc91c5521 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -2,7 +2,7 @@
2#@NAME: Nokia 770 internet tablet 2#@NAME: Nokia 770 internet tablet
3#@DESCRIPTION: Machine configuration for the Compulab CM-X270 3#@DESCRIPTION: Machine configuration for the Compulab CM-X270
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5IPKG_EXTRA_ARCHS = "armv4 armv5te" 5IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt"
6 6
7EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" 7EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
8 8
diff --git a/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf
index 9076355522..eff0ad4c7c 100644
--- a/meta/conf/machine/include/poodle-2.6.conf
+++ b/meta/conf/machine/include/poodle-2.6.conf
@@ -1,43 +1 @@
1PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" require conf/machine/include/zaurus-clamshell-2.6.conf
2
3PCMCIA_MANAGER ?= "pcmciautils"
4
5BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
6${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
7ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
8
9# Ethernet modules
10BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
11# NFS Modules
12BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
13# Crypto Modules
14BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
15# SMB and CRAMFS
16BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
17# Serial Modules
18BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
19# Bluetooth Modules
20BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
21 kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
22 kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
23# Infrared Modules
24BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
25 kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
26
27# USB Gadget Modules
28BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
29 kernel-module-g-serial kernel-module-g-ether"
30
31# Wireless Modules
32BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
33 kernel-module-hermes kernel-module-orinoco \
34 kernel-module-orinoco-cs kernel-module-spectrum-cs \
35 hostap-conf orinoco-conf"
36
37# Sound Modules
38###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
39BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
40 kernel-module-snd-pcm \
41 kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
42
43###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "
diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf
index c7805c36fe..6831b0ea91 100644
--- a/meta/conf/machine/include/tosa-2.6.conf
+++ b/meta/conf/machine/include/tosa-2.6.conf
@@ -1,6 +1,6 @@
1include conf/machine/include/zaurus-clamshell-2.6.conf 1include conf/machine/include/zaurus-clamshell-2.6.conf
2# wlan-ng Modules 2# wlan-ng Modules
3BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb" 3MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
4 4
5# WM97xx Modules 5# WM97xx Modules
6#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" 6#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf
index 936b137517..992f1923c6 100644
--- a/meta/conf/machine/include/tune-arm920t.conf
+++ b/meta/conf/machine/include/tune-arm920t.conf
@@ -1,2 +1,3 @@
1TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" 1PACKAGE_ARCH = "armv4t"
2TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t"
2 3
diff --git a/meta/conf/machine/include/tune-arm926ejs.conf b/meta/conf/machine/include/tune-arm926ejs.conf
index c1462ee148..ce1d4f7203 100644
--- a/meta/conf/machine/include/tune-arm926ejs.conf
+++ b/meta/conf/machine/include/tune-arm926ejs.conf
@@ -1,4 +1,3 @@
1#if gcc breaks change arm926ejs to arm926ej-s
2# For gcc 3.x you need: 1# For gcc 3.x you need:
3TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" 2TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
4# For gcc 4.x you need: 3# For gcc 4.x you need:
diff --git a/meta/conf/machine/include/tune-ep9312.conf b/meta/conf/machine/include/tune-ep9312.conf
index f7a6fb845b..0982cf2a13 100644
--- a/meta/conf/machine/include/tune-ep9312.conf
+++ b/meta/conf/machine/include/tune-ep9312.conf
@@ -1,4 +1,4 @@
1TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312" 1TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
2# add "-mfp=maverick" for newer gcc versions > 4.0 2# add "-mfp=maverick" for newer gcc versions > 4.0
3 3
4#set arch to ep9312 for all generated packages 4#set arch to ep9312 for all generated packages
diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
index fa2adda6fb..e0a9e38e91 100644
--- a/meta/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -15,4 +15,6 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd"
15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" 15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
16MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" 16MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" 17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
18MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
18 19
20MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf
index 00d687963f..e600a4926d 100644
--- a/meta/conf/machine/include/zaurus-clamshell.conf
+++ b/meta/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
1TARGET_ARCH = "arm" 1TARGET_ARCH = "arm"
2IPKG_EXTRA_ARCHS = "armv4 armv5te" 2IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
3 3
4PREFERRED_PROVIDER_xserver = "xserver-kdrive" 4PREFERRED_PROVIDER_xserver = "xserver-kdrive"
5 5
diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf
index e621d7b9b8..bd92ad5dee 100644
--- a/meta/conf/machine/ipaq-pxa270.conf
+++ b/meta/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices 3#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" 6IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
7 7
8#use this for a hx2xxx ipaq 8#use this for a hx2xxx ipaq
9PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 9PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index 6588702a84..af50217e0f 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -7,6 +7,7 @@ include conf/machine/include/zaurus-clamshell-2.6.conf
7 7
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9
10IPKG_EXTRA_ARCHS += "iwmmxt"
10IMAGE_FSTYPES ?= "tar.gz" 11IMAGE_FSTYPES ?= "tar.gz"
11 12
12ROOT_FLASH_SIZE = "100" 13ROOT_FLASH_SIZE = "100"