summaryrefslogtreecommitdiffstats
path: root/openembedded/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-09 16:10:18 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-09 16:10:18 +0000
commit8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c (patch)
tree86922c4000d1f4550c9dee9c14856968c95d4951 /openembedded/conf
parent0d791a970638c9398ed94adafecbca54a0ea5374 (diff)
downloadpoky-8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c.tar.gz
Sync conf files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@373 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r--openembedded/conf/bitbake.conf18
-rw-r--r--openembedded/conf/distro/preferred-e-versions.inc52
-rw-r--r--openembedded/conf/distro/preferred-opie-versions.inc13
-rw-r--r--openembedded/conf/documentation.conf8
-rw-r--r--openembedded/conf/machine/akita.conf4
-rw-r--r--openembedded/conf/machine/c7x0.conf4
-rw-r--r--openembedded/conf/machine/include/poodle-2.4.conf10
-rw-r--r--openembedded/conf/machine/include/poodle-2.6.conf41
-rw-r--r--openembedded/conf/machine/include/tosa-2.4.conf20
-rw-r--r--openembedded/conf/machine/include/tune-arm926ejs.conf3
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.4.conf40
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf1
-rw-r--r--openembedded/conf/machine/nokia770.conf6
-rw-r--r--openembedded/conf/machine/qemuarm.conf2
-rw-r--r--openembedded/conf/machine/spitz.conf4
-rw-r--r--openembedded/conf/sanity.conf2
16 files changed, 105 insertions, 123 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 3b642e58f7..2043a500eb 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -304,6 +304,8 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
304GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" 304GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
305FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" 305FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
306HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" 306HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
307E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e"
308E_URI = "http://enlightenment.freedesktop.org/files"
307FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" 309FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
308GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" 310GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
309APACHE_MIRROR = "http://www.apache.org/dist" 311APACHE_MIRROR = "http://www.apache.org/dist"
@@ -313,13 +315,13 @@ APACHE_MIRROR = "http://www.apache.org/dist"
313# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge" 315# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge"
314# into your local.conf 316# into your local.conf
315 317
316FETCHCOMMAND = "" 318FETCHCOMMAND = "ERROR, this must be a BitBake bug"
317FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" 319FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
318FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}" 320FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
319RESUMECOMMAND = "" 321RESUMECOMMAND = "ERROR, this must be a BitBake bug"
320RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" 322RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
321UPDATECOMMAND = "" 323UPDATECOMMAND = "ERROR, this must be a BitBake bug"
322UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}" 324UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
323SRCDATE = "${DATE}" 325SRCDATE = "${DATE}"
324 326
325SRC_URI = "file://${FILE}" 327SRC_URI = "file://${FILE}"
@@ -400,4 +402,10 @@ require conf/sanity.conf
400# Weak variables (usually to retain backwards compatibility) 402# Weak variables (usually to retain backwards compatibility)
401################################################################## 403##################################################################
402 404
403PCMCIA_MANAGER ?= "pcmcia-cs" \ No newline at end of file 405PCMCIA_MANAGER ?= "pcmcia-cs"
406
407
408##################################################################
409# Magic Cookie for SANITY CHECK
410##################################################################
411OES_BITBAKE_CONF = "1"
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index 53f363bf3d..ca35c83796 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,34 +2,32 @@
2# Specify which versions of E-related libraries and applications to build 2# Specify which versions of E-related libraries and applications to build
3# 3#
4 4
5PREFERRED_VERSION_e = "0.16.999.023" 5PREFERRED_VERSION_e = "0.16.999.025"
6PREFERRED_VERSION_ecore-x11 = "0.9.9.023" 6PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
7PREFERRED_VERSION_ecore-native = "0.9.9.023" 7PREFERRED_VERSION_ecore-native = "0.9.9.025"
8PREFERRED_VERSION_edb = "1.0.5.005" 8PREFERRED_VERSION_edb = "1.0.5.006"
9PREFERRED_VERSION_edb-native = "1.0.5.005" 9PREFERRED_VERSION_edb-native = "1.0.5.006"
10PREFERRED_VERSION_edje = "0.5.0.023" 10PREFERRED_VERSION_edje = "0.5.0.025"
11PREFERRED_VERSION_edje-native = "0.5.0.023" 11PREFERRED_VERSION_edje-native = "0.5.0.025"
12PREFERRED_VERSION_eet = "0.9.10.023" 12PREFERRED_VERSION_eet = "0.9.10.025"
13PREFERRED_VERSION_eet-native = "0.9.10.023" 13PREFERRED_VERSION_eet-native = "0.9.10.025"
14PREFERRED_VERSION_embryo = "0.9.1.023" 14PREFERRED_VERSION_embryo = "0.9.1.025"
15PREFERRED_VERSION_embryo-native = "0.9.1.023" 15PREFERRED_VERSION_embryo-native = "0.9.1.025"
16PREFERRED_VERSION_emotion = "0.0.1.004" 16PREFERRED_VERSION_emotion = "0.0.1.004"
17PREFERRED_VERSION_emotion-native = "0.0.1.004" 17PREFERRED_VERSION_emotion-native = "0.0.1.004"
18PREFERRED_VERSION_epeg = "0.9.0.005" 18PREFERRED_VERSION_epeg = "0.9.0.006"
19PREFERRED_VERSION_epsilon = "0.3.0.005" 19PREFERRED_VERSION_epsilon = "0.3.0.006"
20PREFERRED_VERSION_esmart-x11 = "0.9.0.005" 20PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
21PREFERRED_VERSION_evas-x11 = "0.9.9.023" 21PREFERRED_VERSION_evas-x11 = "0.9.9.025"
22PREFERRED_VERSION_evas-native = "0.9.9.023" 22PREFERRED_VERSION_evas-native = "0.9.9.025"
23PREFERRED_VERSION_ewl = "0.0.4.005" 23PREFERRED_VERSION_ewl = "0.0.4.006"
24PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" 24PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
25PREFERRED_VERSION_imlib2-native = "1.2.1.010" 25PREFERRED_VERSION_imlib2-native = "1.2.1.011"
26PREFERRED_VERSION_e-wm = "0.16.999.023" 26PREFERRED_VERSION_e-wm = "0.16.999.025"
27PREFERRED_VERSION_entrance = "0.9.0.005" 27PREFERRED_VERSION_entrance = "0.9.0.006"
28 28
29PREFERRED_PROVIDER_virtual/evas = "evas-x11" 29PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
30PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" 30PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
31PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" 31PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
32PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
32 33
33PREFERRED_VERSION_gnome-vfs-dbus = "svn"
34
35PREFERRED_VERSION_gcc = "3.4.4"
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
index d9f65b3831..5811856e55 100644
--- a/openembedded/conf/distro/preferred-opie-versions.inc
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -1,14 +1,19 @@
1# 1#
2# A list of applications. 2# Opie libraries
3# 3#
4 4PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
5 5PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
6PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
7PREFERRED_VERSION_qte = "${QTE_VERSION}"
6PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" 8PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
7PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" 9PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
8PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" 10PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
9PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" 11PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
10PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" 12PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
11PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" 13PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
14#
15# Opie applications
16#
12PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" 17PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
13PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" 18PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
14PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" 19PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
@@ -191,4 +196,4 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
191PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" 196PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
192PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" 197PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
193PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" 198PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
194PREFERRED_VERSION_konqueror-embedded = "20030705" 199PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
index 57ca4fe237..20bcc53f5f 100644
--- a/openembedded/conf/documentation.conf
+++ b/openembedded/conf/documentation.conf
@@ -91,3 +91,11 @@ GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
91ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale" 91ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale"
92 92
93PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)." 93PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)."
94
95SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
96
97# palmtop build class
98PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
99
100COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser."
101COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." \ No newline at end of file
diff --git a/openembedded/conf/machine/akita.conf b/openembedded/conf/machine/akita.conf
index da699e7258..89c0d031ee 100644
--- a/openembedded/conf/machine/akita.conf
+++ b/openembedded/conf/machine/akita.conf
@@ -2,9 +2,7 @@
2#@NAME: Sharp Zaurus SL-C1000 2#@NAME: Sharp Zaurus SL-C1000
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
4 4
5KERNEL_VERSION ?= "2.6"
6
7include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
9 7
10ROOT_FLASH_SIZE = "58" 8ROOT_FLASH_SIZE = "58"
diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf
index af1c9dad1c..0bd9623526 100644
--- a/openembedded/conf/machine/c7x0.conf
+++ b/openembedded/conf/machine/c7x0.conf
@@ -2,10 +2,8 @@
2#@NAME: Sharp Zaurus SL-C7x0 2#@NAME: Sharp Zaurus SL-C7x0
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
4 4
5KERNEL_VERSION ?= "2.6"
6
7include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
9 7
10ROOT_FLASH_SIZE = "25" 8ROOT_FLASH_SIZE = "25"
11# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. 9# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/openembedded/conf/machine/include/poodle-2.4.conf b/openembedded/conf/machine/include/poodle-2.4.conf
deleted file mode 100644
index 5453fda605..0000000000
--- a/openembedded/conf/machine/include/poodle-2.4.conf
+++ /dev/null
@@ -1,10 +0,0 @@
1PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
2
3# Later versions are broken on kernel 2.4
4PREFERRED_VERSION_orinoco-modules = "0.13e"
5
6BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \
7kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
8kernel-module-usbdcore kernel-module-usbdmonitor \
9hostap-utils prism3-firmware prism3-support"
10
diff --git a/openembedded/conf/machine/include/poodle-2.6.conf b/openembedded/conf/machine/include/poodle-2.6.conf
index 885bf40b4f..9076355522 100644
--- a/openembedded/conf/machine/include/poodle-2.6.conf
+++ b/openembedded/conf/machine/include/poodle-2.6.conf
@@ -1,4 +1,43 @@
1PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 1PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
2 2
3BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" 3PCMCIA_MANAGER ?= "pcmciautils"
4 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/openembedded/conf/machine/include/tosa-2.4.conf b/openembedded/conf/machine/include/tosa-2.4.conf
deleted file mode 100644
index 88df07cddb..0000000000
--- a/openembedded/conf/machine/include/tosa-2.4.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1PREFERRED_PROVIDER_xserver = "xserver-kdrive"
2PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
3
4# Later versions are broken on kernel 2.4
5PREFERRED_VERSION_orinoco-modules = "0.13e"
6
7BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \
8 kernel-module-acm \
9 kernel-module-evdev kernel-module-net-fd \
10 kernel-module-pxa-bi kernel-module-registers \
11 kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
12 kernel hostap-modules-cs orinoco-modules-cs \
13 sharp-sdmmc-support kernel-module-pxa-bi \
14 kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \
15 kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage"
16
17RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
18 kernel-module-usbmouse kernel-module-hid usbutils \
19 kernel-module-evdev"
20
diff --git a/openembedded/conf/machine/include/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..d2c7bfac8d 100644
--- a/openembedded/conf/machine/include/tune-arm926ejs.conf
+++ b/openembedded/conf/machine/include/tune-arm926ejs.conf
@@ -1,3 +1,4 @@
1#if gcc breaks change arm926ejs to arm926ej-s 1#if gcc breaks change arm926ejs to arm926ej-s
2TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" 2#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
3TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
3PACKAGE_ARCH = "armv5te" 4PACKAGE_ARCH = "armv5te"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
deleted file mode 100644
index aaee8765a9..0000000000
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
+++ /dev/null
@@ -1,40 +0,0 @@
1# Zaurus Clamshell specific configuration for kernel 2.4
2# Don't forget to include zaurus-clamshell.conf as well
3
4PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
5PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
6PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
7
8# Later versions are broken on kernel 2.4
9PREFERRED_VERSION_orinoco-modules = "0.13e"
10
11BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
12pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
13wpa-supplicant-nossl ppp ppp-dialin openswan"
14
15# Misc Modules
16BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
17
18# USB Client Modules
19BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
20
21# Bluetooth Modules
22BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
23 kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
24 kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \
25 kernel-module-firmware-class kernel-module-bt3c-cs"
26
27# BI Module
28BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
29BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
30BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
31
32# USB Host Modules
33BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
34 kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
35 kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
36BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
37 kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
38 kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
39
40GPE_EXTRA_INSTALL += "chkhinge"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index c6f4804d5f..66d3eb38ff 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -31,7 +31,6 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
31 31
32SERIAL_CONSOLE = "115200 ttyS0" 32SERIAL_CONSOLE = "115200 ttyS0"
33 33
34include conf/machine/include/ipaq-common.conf
35include conf/machine/include/handheld-common.conf 34include conf/machine/include/handheld-common.conf
36 35
37GUI_MACHINE_CLASS = "bigscreen" 36GUI_MACHINE_CLASS = "bigscreen"
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 41c485c019..dd2127610a 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -6,6 +6,7 @@ IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
6 6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
8PREFERRED_PROVIDER_virtual/bootloader = "" 8PREFERRED_PROVIDER_virtual/bootloader = ""
9PREFERRED_PROVIDER_virutal/tslib = "tslib-maemo"
9 10
10XSERVER = "xserver-kdrive-omap" 11XSERVER = "xserver-kdrive-omap"
11 12
@@ -19,7 +20,8 @@ include conf/machine/include/tune-arm926ejs.conf
19 20
20#size of the root partition (yes, it is 123 MB) 21#size of the root partition (yes, it is 123 MB)
21ROOT_FLASH_SIZE = "123" 22ROOT_FLASH_SIZE = "123"
22EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" 23#EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
24EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n "
23 25
24# serial console port on devboard rev. B3 26# serial console port on devboard rev. B3
25#SERIAL_CONSOLE = "115200 tts/0" 27#SERIAL_CONSOLE = "115200 tts/0"
@@ -27,7 +29,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
27 29
28 30
29#build omap1 till nokia releases the patches 31#build omap1 till nokia releases the patches
30PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" 32PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
31 33
32BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \ 34BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \
33${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" 35${PCMCIA_MANAGER} apm ppp wireless-tools console-tools"
diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf
index 7a558a731d..f3edef9890 100644
--- a/openembedded/conf/machine/qemuarm.conf
+++ b/openembedded/conf/machine/qemuarm.conf
@@ -2,8 +2,6 @@
2#@NAME: qemu ARM Emulator setup 2#@NAME: qemu ARM Emulator setup
3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation 3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
4 4
5KERNEL_VERSION ?= "2.6"
6
7TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
8IPKG_ARCHS = "all arm armv4 armv5te qemuarm" 6IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
9 7
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index 212da52587..f78dd7a3b9 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -2,10 +2,8 @@
2#@NAME: Sharp Zaurus SL-C3000 2#@NAME: Sharp Zaurus SL-C3000
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
4 4
5KERNEL_VERSION ?= "2.6"
6
7include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
9 7
10PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
11PIVOTBOOT_EXTRA_RRECOMMENDS += "" 9PIVOTBOOT_EXTRA_RRECOMMENDS += ""
diff --git a/openembedded/conf/sanity.conf b/openembedded/conf/sanity.conf
index df2ec3e82a..93700ef145 100644
--- a/openembedded/conf/sanity.conf
+++ b/openembedded/conf/sanity.conf
@@ -3,6 +3,6 @@
3# See sanity.bbclass 3# See sanity.bbclass
4# 4#
5# Expert users can confirm their sanity with "touch conf/sanity.conf" 5# Expert users can confirm their sanity with "touch conf/sanity.conf"
6 6BB_MIN_VERSION = "1.3.3"
7INHERIT += "sanity" 7INHERIT += "sanity"
8 8
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 18:59:54 +0000