summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-02-13 21:43:58 +0000
committerRichard Purdie <rpurdie@rpsys.net>2005-02-13 21:43:58 +0000
commit88a2570d6d70d3dca3f682604582d2e2612f1e2c (patch)
treeb91cce0a4b916080ccad9516cf8f021bbcf5595e /conf
parentc3ab2b4569f43fec9107cde7df99149f063f0983 (diff)
Add KERNEL_VERSION option to select kernel preference for zaurus clamshells. Kill off openzaurus-pxa-2.6 machine type.
BKrev: 420fca1ej6LEvrP_Xe_wpNwLC8AyAQ
Diffstat (limited to 'conf')
-rw-r--r--conf/local.conf.sample4
-rw-r--r--conf/machine/openzaurus-pxa-2.6.conf22
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf0
-rw-r--r--conf/machine/zaurus-clamshell-2.6.conf0
4 files changed, 4 insertions, 22 deletions
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 978c2a6dd8..7726cd089f 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -69,6 +69,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# for distributions currently known to OpenEmbedded.
# DISTRO = "familiar"
+# Uncomment this to select a particular kernel version if supported by
+# your MACHINE setting. Currently only supported on Zaurus Clamshells.
+# KERNEL_VERSION = "2.6"
+
# Uncomment one of these to build packages during the build process.
# This is done automatically if you set DISTRO (see above)
# INHERIT = "package_ipk"
diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
deleted file mode 100644
index a3f4c1ee58..0000000000
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C700,Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus PXA devices running a 2.6 kernel
-
-include conf/machine/zaurus-clamshell.conf
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "cvs"
-
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
-pcmcia-cs apm ppp wireless-tools irda-utils udev-utils"
-
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-
-ROOT_FLASH_SIZE = "64"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/zaurus-clamshell-2.4.conf
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/zaurus-clamshell-2.6.conf