summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
committerRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
commitdd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42 (patch)
treee8b9838dc2981038046081efe5145a4227902f7d
parentce241d7e6d8e31411867b5f2127b02c776b39d8a (diff)
downloadpoky-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.tar.gz
Pull conf file updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@270 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--openembedded/conf/bitbake.conf12
-rw-r--r--openembedded/conf/distro/familiar-0.8.3.conf66
-rw-r--r--openembedded/conf/distro/familiar-distro.conf11
-rw-r--r--openembedded/conf/distro/maemo-1.0.conf2
-rw-r--r--openembedded/conf/distro/openzaurus-3.5.4.conf71
-rw-r--r--openembedded/conf/distro/openzaurus.conf7
-rw-r--r--openembedded/conf/distro/preferred-e-versions.inc32
-rw-r--r--openembedded/conf/local.conf.sample6
-rw-r--r--openembedded/conf/machine/akita.conf8
-rw-r--r--openembedded/conf/machine/c7x0.conf9
-rw-r--r--openembedded/conf/machine/include/handheld-common.conf (renamed from openembedded/conf/machine/handheld-common.conf)5
-rw-r--r--openembedded/conf/machine/include/ipaq-common.conf (renamed from openembedded/conf/machine/ipaq-common.conf)2
-rw-r--r--openembedded/conf/machine/include/ixp4xx.conf174
-rw-r--r--openembedded/conf/machine/include/poodle-2.4.conf10
-rw-r--r--openembedded/conf/machine/include/poodle-2.6.conf4
-rw-r--r--openembedded/conf/machine/include/thinclient-common.conf19
-rw-r--r--openembedded/conf/machine/include/tosa-2.4.conf20
-rw-r--r--openembedded/conf/machine/include/tosa-2.6.conf14
-rw-r--r--openembedded/conf/machine/include/tune-arm920t.conf (renamed from openembedded/conf/machine/tune-arm920t.conf)0
-rw-r--r--openembedded/conf/machine/include/tune-arm926ejs.conf (renamed from openembedded/conf/machine/tune-arm926ejs.conf)0
-rw-r--r--openembedded/conf/machine/include/tune-arm9tdmi.conf (renamed from openembedded/conf/machine/tune-arm9tdmi.conf)0
-rw-r--r--openembedded/conf/machine/include/tune-c3.conf3
-rw-r--r--openembedded/conf/machine/include/tune-ep9312.conf6
-rw-r--r--openembedded/conf/machine/include/tune-ppc603e.conf2
-rw-r--r--openembedded/conf/machine/include/tune-ppce500.conf2
-rw-r--r--openembedded/conf/machine/include/tune-sh3.conf1
-rw-r--r--openembedded/conf/machine/include/tune-sh4.conf1
-rw-r--r--openembedded/conf/machine/include/tune-strongarm.conf (renamed from openembedded/conf/machine/tune-strongarm.conf)0
-rw-r--r--openembedded/conf/machine/include/tune-supersparc.conf2
-rw-r--r--openembedded/conf/machine/include/tune-xscale.conf (renamed from openembedded/conf/machine/tune-xscale.conf)0
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.4.conf (renamed from openembedded/conf/machine/zaurus-clamshell-2.4.conf)4
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.6.conf (renamed from openembedded/conf/machine/zaurus-clamshell-2.6.conf)0
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell.conf (renamed from openembedded/conf/machine/zaurus-clamshell.conf)9
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf10
-rw-r--r--openembedded/conf/machine/jornada7xx.conf2
-rw-r--r--openembedded/conf/machine/nokia770.conf10
-rw-r--r--openembedded/conf/machine/spitz.conf12
37 files changed, 329 insertions, 207 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 06d9e61ac5..89ab4ff924 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -67,6 +67,14 @@ TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
67DATETIME = "${DATE}${TIME}" 67DATETIME = "${DATE}${TIME}"
68 68
69################################################################## 69##################################################################
70# Openembedded Software Prerequisites.
71##################################################################
72
73# python-native should be here but python relies on building
74# its own in staging
75ASSUME_PROVIDED = "cvs-native svn-native"
76
77##################################################################
70# Package default variables. 78# Package default variables.
71################################################################## 79##################################################################
72 80
@@ -270,7 +278,6 @@ BUILD_OPTIMIZATION = "-O2"
270# Bootstrap stuff. 278# Bootstrap stuff.
271################################################################## 279##################################################################
272 280
273BOOTSTRAP_EXTRA_DEPENDS = ""
274BOOTSTRAP_EXTRA_RDEPENDS = "" 281BOOTSTRAP_EXTRA_RDEPENDS = ""
275BOOTSTRAP_EXTRA_RRECOMMENDS = "" 282BOOTSTRAP_EXTRA_RRECOMMENDS = ""
276 283
@@ -293,6 +300,7 @@ DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
293SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" 300SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
294GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" 301GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
295XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" 302XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
303XORG_MIRROR = "http://xorg.freedesktop.org/releases"
296GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" 304GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
297FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" 305FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
298HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" 306HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
@@ -309,7 +317,7 @@ RESUMECOMMAND = ""
309RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" 317RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
310UPDATECOMMAND = "" 318UPDATECOMMAND = ""
311UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}" 319UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}"
312CVSDATE = "${DATE}" 320SRCDATE = "${DATE}"
313 321
314SRC_URI = "file://${FILE}" 322SRC_URI = "file://${FILE}"
315 323
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf
deleted file mode 100644
index 53614d9291..0000000000
--- a/openembedded/conf/distro/familiar-0.8.3.conf
+++ /dev/null
@@ -1,66 +0,0 @@
1DISTRO = "familiar"
2DISTRO_NAME = "Familiar Linux"
3DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}"
4
5include conf/distro/familiar.conf
6
7"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}"
8
9
10
11DISTRO_TYPE = "debug"
12#DISTRO_TYPE = "release"
13
14FEED_URIS += " \
15 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
16 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
17
18#CVSDATE = 20050331
19
20PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
21PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
22PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
23
24PREFERRED_PROVIDER_virtual/libiconv=glibc
25PREFERRED_PROVIDER_virtual/libintl=glibc
26PREFERRED_PROVIDER_x11=diet-x11
27
28PREFERRED_VERSION_hostap-modules ?= "0.3.9"
29
30# The CSL compiler is unusable because
31# 1) certain programs stop to compile
32# 2) more programs segfault
33PREFERRED_VERSION_gcc ?= "3.4.4"
34PREFERRED_VERSION_gcc-cross ?= "3.4.4"
35PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
36
37#
38# Opie
39#
40
41PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
42PREFERRED_VERSION_qte = "2.3.10"
43
44OPIE_VERSION = "1.2.1"
45include conf/distro/preferred-opie-versions.inc
46
47#
48# GPE
49#
50
51PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
52PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
53PREFERRED_PROVIDER_x11 = "diet-x11"
54
55include conf/distro/preferred-gpe-versions-2.7.inc
56
57#
58# E
59#
60
61
62#23:57 < mickeyl> it's no longer necessary since our cleanup
63#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
64
65#include conf/distro/preferred-e-versions.inc
66
diff --git a/openembedded/conf/distro/familiar-distro.conf b/openembedded/conf/distro/familiar-distro.conf
deleted file mode 100644
index 497ba6a89c..0000000000
--- a/openembedded/conf/distro/familiar-distro.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Distribution
2#@NAME: Familiar Linux
3#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
4
5INHERIT += "package_ipk debian"
6TARGET_OS = "linux"
7
8PARALLEL_INSTALL_MODULES = "1"
9
10UDEV_DEVFS_RULES = "1"
11
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
index 15ec45f34e..f83e4b1d96 100644
--- a/openembedded/conf/distro/maemo-1.0.conf
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
11 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ 11 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
12 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" 12 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
13 13
14#CVSDATE = 20050331 14#SRCDATE = 20050331
15 15
16PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" 16PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
deleted file mode 100644
index 8fbcbefa4b..0000000000
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ /dev/null
@@ -1,71 +0,0 @@
1DISTRO = "openzaurus"
2DISTRO_NAME = "OpenZaurus"
3DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
4
5include conf/distro/openzaurus.conf
6
7
8# DISTRO_VERSION = "3.5.4"
9DISTRO_TYPE = "debug"
10# DISTRO_TYPE = "release"
11
12FEED_URIS += " \
13 upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
14upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
15 machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
16 base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
17 libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
18 console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
19 devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
20
21# CVSDATE = "20050704"
22
23#
24# Zaurus
25#
26
27ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
28OEINCLUDELOGS = "yes"
29KERNEL_CONSOLE = "ttyS0"
30#DEBUG_OPTIMIZATION = "-O -g3"
31#DEBUG_BUILD = "1"
32#INHIBIT_PACKAGE_STRIP = "1"
33
34PREFERRED_VERSION_gcc-cross ?= "3.4.4"
35PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
36
37PREFERRED_VERSION_hostap-modules ?= "0.3.9"
38
39#fix some iconv issues, needs to be adjusted when doing uclibc builds
40PREFERRED_PROVIDER_virtual/libiconv=glibc
41PREFERRED_PROVIDER_virtual/libintl=glibc
42
43
44#
45# Base
46#
47PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
48PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
49PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
50PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
51
52#
53# Opie
54#
55PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
56
57OPIE_VERSION = "1.2.1"
58include conf/distro/preferred-opie-versions.inc
59
60#
61# GPE
62#
63PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
64PREFERRED_PROVIDER_x11 = "diet-x11"
65include conf/distro/preferred-gpe-versions-2.7.inc
66
67#
68# E
69#
70#include conf/distro/preferred-e-versions.inc
71
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
index a935ed4ac2..edcbacc80e 100644
--- a/openembedded/conf/distro/openzaurus.conf
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -2,12 +2,19 @@
2#@NAME: OpenZaurus 2#@NAME: OpenZaurus
3#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) 3#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
4 4
5DISTRO = "openzaurus"
6DISTRO_NAME = "OpenZaurus"
7
5INHERIT += " package_ipk debian" 8INHERIT += " package_ipk debian"
6# For some reason, this doesn't work 9# For some reason, this doesn't work
7# TARGET_OS ?= "linux" 10# TARGET_OS ?= "linux"
8TARGET_OS = "linux" 11TARGET_OS = "linux"
9TARGET_FPU = "soft" 12TARGET_FPU = "soft"
10 13
14BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
15
11PARALLEL_INSTALL_MODULES = "1" 16PARALLEL_INSTALL_MODULES = "1"
12 17
13DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" 18DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
19
20include conf/distro/include/multimachine.conf
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index d861944d53..e4571f1ae6 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,12 +2,26 @@
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_ecore = "0.9.9.013" 5PREFERRED_VERSION_e = "0.16.999.023"
6PREFERRED_VERSION_edb = "1.0.5.004" 6PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
7PREFERRED_VERSION_edje = "0.5.0.013" 7PREFERRED_VERSION_ecore-native = "0.9.9.023"
8PREFERRED_VERSION_eet = "0.9.10.013" 8PREFERRED_VERSION_edb = "1.0.5.005"
9PREFERRED_VERSION_embryo = "0.9.1.013" 9PREFERRED_VERSION_edb-native = "1.0.5.005"
10PREFERRED_VERSION_etox = "0.9.0.004" 10PREFERRED_VERSION_edje = "0.5.0.023"
11PREFERRED_VERSION_evas = "0.9.9.013" 11PREFERRED_VERSION_edje-native = "0.5.0.023"
12PREFERRED_VERSION_ewl = "0.0.4.004" 12PREFERRED_VERSION_eet = "0.9.10.023"
13PREFERRED_VERSION_imlib2 = "1.2.1.004" 13PREFERRED_VERSION_eet-native = "0.9.10.023"
14PREFERRED_VERSION_embryo = "0.9.1.023"
15PREFERRED_VERSION_embryo-native = "0.9.1.023"
16PREFERRED_VERSION_emotion = "0.0.1.004"
17PREFERRED_VERSION_emotion-native = "0.0.1.004"
18PREFERRED_VERSION_epeg = "0.9.0.005"
19PREFERRED_VERSION_epsilon = "0.3.0.005"
20PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
21PREFERRED_VERSION_evas-x11 = "0.9.9.023"
22PREFERRED_VERSION_evas-native = "0.9.9.023"
23PREFERRED_VERSION_ewl = "0.0.4.005"
24PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
25PREFERRED_VERSION_imlib2-native = "1.2.1.010"
26PREFERRED_VERSION_e-wm = "0.16.999.023"
27PREFERRED_VERSION_entrance = "0.9.0.005"
diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample
index 49b66b2e50..70abc98921 100644
--- a/openembedded/conf/local.conf.sample
+++ b/openembedded/conf/local.conf.sample
@@ -40,11 +40,11 @@ BBMASK = ""
40# provide packages for toolchain and additional libraries yourself. You also 40# provide packages for toolchain and additional libraries yourself. You also
41# have to set PATH in your environment to make sure BitBake finds additional binaries. 41# have to set PATH in your environment to make sure BitBake finds additional binaries.
42# Note: You will definitely need to say: 42# Note: You will definitely need to say:
43# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" 43# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
44# to build any of two Linux 2.4 Embedix kernels, 44# to build any of two Linux 2.4 Embedix kernels,
45# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget 45# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
46# to rename the binaries as instructed in the Wiki. 46# to rename the binaries as instructed in the Wiki.
47# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" 47# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
48 48
49# Select between multiple alternative providers, if more than one is eligible. 49# Select between multiple alternative providers, if more than one is eligible.
50PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" 50PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
@@ -78,7 +78,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
78# Uncomment this to select a distribution policy. See the conf directory 78# Uncomment this to select a distribution policy. See the conf directory
79# for distributions currently known to OpenEmbedded. 79# for distributions currently known to OpenEmbedded.
80# Stay away from unversioned distros unless you really know what you are doing 80# Stay away from unversioned distros unless you really know what you are doing
81# DISTRO = "familiar-0.8.3" 81# DISTRO = "familiar-unstable"
82 82
83# Uncomment this to select a particular kernel version if supported by 83# Uncomment this to select a particular kernel version if supported by
84# your MACHINE setting. Currently only supported on Zaurus Clamshells. 84# your MACHINE setting. Currently only supported on Zaurus Clamshells.
diff --git a/openembedded/conf/machine/akita.conf b/openembedded/conf/machine/akita.conf
index cfcc411671..da699e7258 100644
--- a/openembedded/conf/machine/akita.conf
+++ b/openembedded/conf/machine/akita.conf
@@ -2,9 +2,9 @@
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.4" 5KERNEL_VERSION ?= "2.6"
6 6
7include conf/machine/zaurus-clamshell.conf 7include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf 8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
9 9
10ROOT_FLASH_SIZE = "64" 10ROOT_FLASH_SIZE = "58"
diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf
index c5e42a2bed..af1c9dad1c 100644
--- a/openembedded/conf/machine/c7x0.conf
+++ b/openembedded/conf/machine/c7x0.conf
@@ -4,9 +4,8 @@
4 4
5KERNEL_VERSION ?= "2.6" 5KERNEL_VERSION ?= "2.6"
6 6
7include conf/machine/zaurus-clamshell.conf 7include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf 8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
9
10ROOT_FLASH_SIZE = "32"
11# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
12 9
10ROOT_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.
diff --git a/openembedded/conf/machine/handheld-common.conf b/openembedded/conf/machine/include/handheld-common.conf
index 4bb8325dea..467d5e59f1 100644
--- a/openembedded/conf/machine/handheld-common.conf
+++ b/openembedded/conf/machine/include/handheld-common.conf
@@ -16,9 +16,10 @@ irda irlan irnet irport irtty ircomm-tty \
16input uinput \ 16input uinput \
17" 17"
18 18
19PCMCIA_MANAGER ?= "pcmcia-cs"
20
19# Configuration bits for "generic handheld" 21# Configuration bits for "generic handheld"
20BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" 22BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
21BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts"
22BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" 23BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
23 24
24INHERIT += "linux_modules" 25INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/ipaq-common.conf b/openembedded/conf/machine/include/ipaq-common.conf
index 791abd2103..eb696cf9f9 100644
--- a/openembedded/conf/machine/ipaq-common.conf
+++ b/openembedded/conf/machine/include/ipaq-common.conf
@@ -1,7 +1,5 @@
1IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 1IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev"
2 2
3BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
4BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
5BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" 3BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
6BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" 4BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
7 5
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf
new file mode 100644
index 0000000000..639bf4a74e
--- /dev/null
+++ b/openembedded/conf/machine/include/ixp4xx.conf
@@ -0,0 +1,174 @@
1#@TYPE: Machine configuration
2#@NAME: ixp4xx
3#@DESCRIPTION: genric machine configuration for ixp4xx platforms
4
5#-------------------------------------------------------------------------------
6# INPUTS
7#-------------------------------------------------------------------------------
8# conf/${DISTRO}.conf is included after this file and should be used to modify
9# variables identified as 'INPUTS' to the required values for the DISTRO, this
10# will cause the board specific settings (which depend for the most part on the
11# exact CPU used) to be set correctly within this file. The results are the
12# variables identifies here as 'OUTPUTS'
13#
14#variable = "default"
15# <possible values>
16# description
17
18ARCH_BYTE_SEX = "be"
19# "be" "le"
20# The memory byte sex and (on correctly implemented hardware - the IXP4XX is
21# correct) the byte sex of the buses within the system. 'be' (big-endian)
22# means that the first byte is the most significant byte on a bus, 'le'
23# (little-endian) means that the first byte is the least significant byte.
24
25ARM_INSTRUCTION_SET = "arm"
26# "arm" "thumb"
27# The instruction set the compiler should use when generating application
28# code. The kernel is always compiled with arm code at present. arm code
29# is the original 32 bit ARM instruction set, thumb code is the 16 bit
30# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
31# but requires more instructions (140% for 70% smaller code) so may be
32# slower.
33
34THUMB_INTERWORK = "yes"
35# "yes" "no"
36# Whether to compile with code to allow interworking between the two
37# instruction sets. This allows thumb code to be executed on a primarily
38# arm system and vice versa. It is strongly recommended that DISTROs not
39# turn this off - the actual cost is very small.
40
41DISTRO_BASE = ""
42# "" ":<base>"
43# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
44# after ${DISTRO}, this allows different distros to share a common base of
45# overrides. The value given must include a leading ':' or chaos will result.
46
47IXP4XX_SUFFIX = "${MACHINE_ARCH}"
48# <string>
49# Kernel suffix - 'ixp4xxbe' or 'ixp4xxle' for a truely generic image, controls
50# the suffix on the name of the generated zImage, override in the DISTRO
51# configuration if patches or defconfig are changed for the DISTRO.
52
53#-------------------------------------------------------------------------------
54# OUTPUTS
55#-------------------------------------------------------------------------------
56
57#OVERRIDES
58# The standard ':' separated list of overrides used by bitbake - see the
59# basic setting in bitbake.conf. This list is based on that used for the
60# standard setting however :<base>, :thumb and :thumb-interwork will be
61# inserted at appropriate points if a base distro, default use of thumb or
62# arm/thumb interworking are enabled in the inputs.
63OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
64OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
65OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
66
67# TARGET_CC_ARCH
68# TARGET_CC_KERNEL_ARCH
69# TARGET_LD_ARCH
70# TARGET_LD_KERNEL_ARCH
71# Compiler and linker options for application code and kernel code. These
72# options ensure that the compiler has the correct settings for the selected
73# instruction set and interworking.
74ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
75ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
76#
77TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
78TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb"
79TARGET_LD_ARCH = ""
80TARGET_LD_KERNEL_ARCH = ""
81
82# FULL_OPTIMIZATION
83# Optimization settings. Os works fine and is significantly better than O2.
84# The other settings are somewhat arbitrary. The optimisations chosen here
85# include the ones which 'break' symbolic debugging (because the compiler does
86# not include enough information to allow the debugger to know where given
87# values are.) The -fno options are an attempt to cancel explicit use of space
88# consuming options found in some packages (this isn't a complete list, this is
89# just the ones which package writers seem to know about and abuse).
90FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
91 -fno-unroll-loops -fno-inline-functions \
92 -fweb -funit-at-a-time"
93
94# TARGET_ARCH
95# The correct setting for the system endianness (ARCH_BYTE_SEX). This will
96# be arm (le) or armeb (be) - it is difficult to be more precise in the
97# setting because of the large number of ways it is used within OpenEmbedded.
98TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
99
100# TARGET_PACKAGE_ARCH [not used]
101# The correct setting for the generated packages. This corresponds to the
102# -march flag passed to the compiler because that limits the architectures
103# on which the generated code will run.
104BYTE_SEX_CHAR = "${@['b', 'l'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
105TARGET_PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
106TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
107
108# MACHINE_ARCH
109# The correct setting for packages which are specific to the machine, this
110# defaults to ${MACHINE} in bitbake.conf, however it is set to ixp4xx here
111# because everything built here is no more specific than that.
112MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
113
114# IPKG_ARCHS
115# The full list of package architectures which should run on the system.
116# This takes into account both the board level issues and the INPUTS set
117# by the distro. The arm list is derived from the architecture settings
118# known to gcc, the thumb list is then derived from that (only the 't'
119# architectures of course).
120#[not used]: TARGET_ARCH is handled below because it is also currently
121# used for thumb packages.
122#ARM_ARCHITECTURES = "${TARGET_ARCH} armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
123ARM_ARCHITECTURES = "armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
124THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t${BYTE_SEX_CHAR}"
125
126# NOTE: this list contains just the things which rootfs_ipk.bbclass does
127# not add, rootfs_ipk.bbclass evaluates:
128#
129# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
130#
131# This is a priority ordered list - most desireable architecture at the end,
132# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
133# THUMB_INTERWORK precede this with the other architectures.
134IPKG_ARCHS = "ixp4xx ${MACHINE} \
135 ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
136 (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
137 + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
138 (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \
139 bb.data.getVar('ARM_ARCHITECTURES', d, 1), \
140 bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \
141 bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \
142 ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}"
143
144# IPKG_ARCH_LIST [not used]
145# This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing
146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and
147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific
148# versions.
149IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
150
151#-------------------------------------------------------------------------------
152# Package versions
153#-------------------------------------------------------------------------------
154# Warning: these are shared across the different machine and distro
155# configurations but can be overridden therein if required.
156SRCDATE_ipkg-utils ?= "20060106"
157SRCDATE_ipkg-utils-native ?= "20060106"
158SRCDATE_ipkg-link ?= "20060106"
159SRCDATE_irssi ?= "20050930"
160
161CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
162INHERIT += "nslu2-mirrors"
163
164PREFERRED_VERSION_ipkg ?= "0.99.154"
165PREFERRED_VERSION_ipkg-native ?= "0.99.154"
166
167#-------------------------------------------------------------------------------
168# Board defaults
169#-------------------------------------------------------------------------------
170# These values are board specific but they seem to be common to a large number
171# of boards so are reasonable defaults.
172SERIAL_CONSOLE = "115200 ttyS0"
173KERNEL_CONSOLE = "ttyS0,115200n8"
174USE_VT = "0"
diff --git a/openembedded/conf/machine/include/poodle-2.4.conf b/openembedded/conf/machine/include/poodle-2.4.conf
new file mode 100644
index 0000000000..5453fda605
--- /dev/null
+++ b/openembedded/conf/machine/include/poodle-2.4.conf
@@ -0,0 +1,10 @@
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
new file mode 100644
index 0000000000..885bf40b4f
--- /dev/null
+++ b/openembedded/conf/machine/include/poodle-2.6.conf
@@ -0,0 +1,4 @@
1PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
2
3BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
4
diff --git a/openembedded/conf/machine/include/thinclient-common.conf b/openembedded/conf/machine/include/thinclient-common.conf
new file mode 100644
index 0000000000..4a96b42525
--- /dev/null
+++ b/openembedded/conf/machine/include/thinclient-common.conf
@@ -0,0 +1,19 @@
1THINCLIENT_MODULES = "ipv6 \
2mip6-mn \
3tun \
4loop \
5vfat \
6sunrpc nfs \
7rfcomm bnep l2cap sco \
8af_packet \
9ppp-async ppp-deflate ppp-mppe \
10ip-gre ip-tables ipip \
11irda irlan irnet irport irtty \
12input uinput \
13"
14
15# Configuration bits for "generic thinclient"
16BOOTSTRAP_EXTRA_RDEPENDS += "apm"
17BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
18
19INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/include/tosa-2.4.conf b/openembedded/conf/machine/include/tosa-2.4.conf
new file mode 100644
index 0000000000..88df07cddb
--- /dev/null
+++ b/openembedded/conf/machine/include/tosa-2.4.conf
@@ -0,0 +1,20 @@
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/tosa-2.6.conf b/openembedded/conf/machine/include/tosa-2.6.conf
new file mode 100644
index 0000000000..fdd706d093
--- /dev/null
+++ b/openembedded/conf/machine/include/tosa-2.6.conf
@@ -0,0 +1,14 @@
1include conf/machine/include/zaurus-clamshell-2.6.conf
2# SOUND Modules
3BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
4
5module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
6module_autoload_snd-pcm-oss ="snd-pcm-oss"
7
8# WM97xx Modules
9BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
10module_autoload_wm9705 = "wm9705"
11#module_autoload_pxa-wm97xx = "pen_int=0"
12
13#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
14#module_autoload_wm97xx = "wm97xx"
diff --git a/openembedded/conf/machine/tune-arm920t.conf b/openembedded/conf/machine/include/tune-arm920t.conf
index 936b137517..936b137517 100644
--- a/openembedded/conf/machine/tune-arm920t.conf
+++ b/openembedded/conf/machine/include/tune-arm920t.conf
diff --git a/openembedded/conf/machine/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..5e2f6b7c62 100644
--- a/openembedded/conf/machine/tune-arm926ejs.conf
+++ b/openembedded/conf/machine/include/tune-arm926ejs.conf
diff --git a/openembedded/conf/machine/tune-arm9tdmi.conf b/openembedded/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad1c1..cfc3bad1c1 100644
--- a/openembedded/conf/machine/tune-arm9tdmi.conf
+++ b/openembedded/conf/machine/include/tune-arm9tdmi.conf
diff --git a/openembedded/conf/machine/include/tune-c3.conf b/openembedded/conf/machine/include/tune-c3.conf
new file mode 100644
index 0000000000..e6a522af10
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-c3.conf
@@ -0,0 +1,3 @@
1TARGET_CC_ARCH = "-march=c3 -mtune=c3"
2PACKAGE_ARCH = "i586"
3
diff --git a/openembedded/conf/machine/include/tune-ep9312.conf b/openembedded/conf/machine/include/tune-ep9312.conf
new file mode 100644
index 0000000000..f7a6fb845b
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ep9312.conf
@@ -0,0 +1,6 @@
1TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312"
2# add "-mfp=maverick" for newer gcc versions > 4.0
3
4#set arch to ep9312 for all generated packages
5PACKAGE_ARCH = "ep9312"
6
diff --git a/openembedded/conf/machine/include/tune-ppc603e.conf b/openembedded/conf/machine/include/tune-ppc603e.conf
new file mode 100644
index 0000000000..7c8714cfc2
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ppc603e.conf
@@ -0,0 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=603e"
2PACKAGE_ARCH = "ppc603e"
diff --git a/openembedded/conf/machine/include/tune-ppce500.conf b/openembedded/conf/machine/include/tune-ppce500.conf
new file mode 100644
index 0000000000..11717eba70
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ppce500.conf
@@ -0,0 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=8540"
2PACKAGE_ARCH = "ppce500"
diff --git a/openembedded/conf/machine/include/tune-sh3.conf b/openembedded/conf/machine/include/tune-sh3.conf
new file mode 100644
index 0000000000..192dd8fd22
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-sh3.conf
@@ -0,0 +1 @@
TARGET_CC_ARCH = "-ml -m3"
diff --git a/openembedded/conf/machine/include/tune-sh4.conf b/openembedded/conf/machine/include/tune-sh4.conf
new file mode 100644
index 0000000000..866f7f89d5
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-sh4.conf
@@ -0,0 +1 @@
TARGET_CC_ARCH = "-ml -m4"
diff --git a/openembedded/conf/machine/tune-strongarm.conf b/openembedded/conf/machine/include/tune-strongarm.conf
index 8654c996ef..8654c996ef 100644
--- a/openembedded/conf/machine/tune-strongarm.conf
+++ b/openembedded/conf/machine/include/tune-strongarm.conf
diff --git a/openembedded/conf/machine/include/tune-supersparc.conf b/openembedded/conf/machine/include/tune-supersparc.conf
new file mode 100644
index 0000000000..1b1ec1207f
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-supersparc.conf
@@ -0,0 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=supersparc"
2PACKAGE_ARCH = "supersparc"
diff --git a/openembedded/conf/machine/tune-xscale.conf b/openembedded/conf/machine/include/tune-xscale.conf
index 0b98f09fc8..0b98f09fc8 100644
--- a/openembedded/conf/machine/tune-xscale.conf
+++ b/openembedded/conf/machine/include/tune-xscale.conf
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
index d61dc197b2..184258c8b6 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.4.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -9,10 +9,6 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
9# Later versions are broken on kernel 2.4 9# Later versions are broken on kernel 2.4
10PREFERRED_VERSION_orinoco-modules = "0.13e" 10PREFERRED_VERSION_orinoco-modules = "0.13e"
11 11
12BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
13pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
14wpa-supplicant-nossl ppp ppp-dialin openswan"
15
16BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ 12BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
17pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ 13pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
18wpa-supplicant-nossl ppp ppp-dialin openswan" 14wpa-supplicant-nossl ppp ppp-dialin openswan"
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
index 007750a39b..007750a39b 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
diff --git a/openembedded/conf/machine/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index f55f2d2554..ec10cd5e4e 100644
--- a/openembedded/conf/machine/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -4,22 +4,19 @@ IPKG_ARCHS = "all arm armv4 armv5te c7x0"
4PREFERRED_PROVIDER_xserver = "xserver-kdrive" 4PREFERRED_PROVIDER_xserver = "xserver-kdrive"
5 5
6EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" 6EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
7EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700" 7EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
8 8
9IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ 9IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
10 --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ 10 --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
11 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ 11 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
12 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" 12 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
13 13
14BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
15
16GUI_MACHINE_CLASS = "bigscreen" 14GUI_MACHINE_CLASS = "bigscreen"
17GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
18GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" 15GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
19 16
20include conf/machine/handheld-common.conf 17include conf/machine/include/handheld-common.conf
21 18
22# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 19# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
23include conf/machine/tune-xscale.conf 20include conf/machine/include/tune-xscale.conf
24 21
25SERIAL_CONSOLE = "115200 ttyS0" 22SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 626b5cf218..0c432ad674 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -9,9 +9,6 @@ PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
9 9
10PREFERRED_VERSION_orinoco-modules = "0.15rc1" 10PREFERRED_VERSION_orinoco-modules = "0.15rc1"
11 11
12BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
13BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
14
15ROOT_FLASH_SIZE = "80" 12ROOT_FLASH_SIZE = "80"
16 13
17BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" 14BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
@@ -23,15 +20,14 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
23 20
24SERIAL_CONSOLE = "115200 ttyS0" 21SERIAL_CONSOLE = "115200 ttyS0"
25 22
26include conf/machine/ipaq-common.conf 23include conf/machine/include/ipaq-common.conf
27include conf/machine/handheld-common.conf 24include conf/machine/include/handheld-common.conf
28 25
29GUI_MACHINE_CLASS = "bigscreen" 26GUI_MACHINE_CLASS = "bigscreen"
30GPE_EXTRA_DEPENDS += "gaim"
31GPE_EXTRA_INSTALL += "gaim" 27GPE_EXTRA_INSTALL += "gaim"
32 28
33# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 29# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
34include conf/machine/tune-xscale.conf 30include conf/machine/include/tune-xscale.conf
35 31
36BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" 32BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
37HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ 33HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
index b3e1840469..82eff0b563 100644
--- a/openembedded/conf/machine/jornada7xx.conf
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -5,4 +5,4 @@
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_ARCHS = "all arm ${MACHINE}" 6IPKG_ARCHS = "all arm ${MACHINE}"
7 7
8include conf/machine/tune-strongarm.conf \ No newline at end of file 8include conf/machine/include/tune-strongarm.conf \ No newline at end of file
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 637b4311f4..d022d8703a 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -11,11 +11,10 @@ XSERVER = "xserver-kdrive-omap"
11 11
12# 800x480 is big enough for me 12# 800x480 is big enough for me
13GUI_MACHINE_CLASS = "bigscreen" 13GUI_MACHINE_CLASS = "bigscreen"
14GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
15GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" 14GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
16 15
17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 16# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
18include conf/machine/tune-arm926ejs.conf 17include conf/machine/include/tune-arm926ejs.conf
19 18
20 19
21#size of the root partition (yes, it is 123 MB) 20#size of the root partition (yes, it is 123 MB)
@@ -30,11 +29,8 @@ SERIAL_CONSOLE = "115200 ttyS0"
30#build omap1 till nokia releases the patches 29#build omap1 till nokia releases the patches
31PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" 30PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
32 31
33BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \
34apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
35
36BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ 32BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \
37apm ppp wireless-tools console-tools" 33pcmcia-cs apm ppp wireless-tools console-tools"
38 34
39# NFS Modules 35# NFS Modules
40#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" 36#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
@@ -56,5 +52,5 @@ apm ppp wireless-tools console-tools"
56 52
57ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " 53ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
58 54
59include conf/machine/handheld-common.conf 55include conf/machine/include/handheld-common.conf
60 56
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index 9a53e8f1a9..e1cb468d8f 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -2,19 +2,19 @@
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.4" 5KERNEL_VERSION ?= "2.6"
6 6
7include conf/machine/zaurus-clamshell.conf 7include conf/machine/include/zaurus-clamshell.conf
8include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf 8include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
9 9
10PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs"
11PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" 10PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
12PIVOTBOOT_EXTRA_RRECOMMENDS += "" 11PIVOTBOOT_EXTRA_RRECOMMENDS += ""
13 12
14# Useful things for the built-in Harddisk 13# Useful things for the built-in Harddisk
15BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" 14BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
16BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs"
17 15
18IMAGE_FSTYPES = "jffs2 tar.gz" 16IMAGE_FSTYPES = "jffs2 tar.gz"
19 17
20ROOT_FLASH_SIZE = "100" 18ROOT_FLASH_SIZE = "100"
19# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
20# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte