summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-17 15:39:39 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-17 15:39:39 +0000
commit9fa8c781ca71c751c09dbcb96363f66e1a455837 (patch)
tree0348f4489e783a511f5d22e0c2f71eed2b60ffb6 /conf/machine
parentaa0b5a6e4c84b971c70cb4fd73a0e256f8c81a5e (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/17 16:03:27+01:00 rpsys.net!RP Tidy up 2.4 kernel modules for c7x0, akita and spitz 2005/05/17 15:38:04+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/17 15:37:40+01:00 rpsys.net!RP Enable KERNEL_VERSION setting for akita/spitz BKrev: 428a103b1w_wa23ZJ2H4zvVhGjzUIw
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/akita.conf13
-rw-r--r--conf/machine/c7x0.conf2
-rw-r--r--conf/machine/spitz.conf13
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf13
4 files changed, 19 insertions, 22 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index d3d34354e0..cfcc411671 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,16 +2,9 @@
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-2.4.conf
-
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa27x"
+KERNEL_VERSION ?= "2.4"
-# BI Module
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxa27x-bi"
-
-# USB Host Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb kernel-module-bfusb"
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
ROOT_FLASH_SIZE = "64"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 9693adbbbe..122f2de435 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -7,8 +7,6 @@ KERNEL_VERSION ?= "2.4"
include conf/machine/zaurus-clamshell.conf
include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
-BOOTSTRAP_EXTRA_RDEPENDS += "${@base_conditional('KERNEL_VERSION', '2.4', 'kernel-module-pxa-bi', '', d)}"
-
ROOT_FLASH_SIZE = "32"
# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 76035c1889..a0c990524e 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,10 +2,10 @@
#@NAME: Sharp Zaurus SL-C3000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-2.4.conf
+KERNEL_VERSION ?= "2.4"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa27x"
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs"
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
@@ -15,13 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
BOOTSTRAP_EXTRA_DEPENDS += "hdparm"
BOOTSTRAP_EXTRA_RDEPENDS += "hdparm"
-# BI Module
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxa27x-bi"
-
-# USB Host Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb kernel-module-bfusb"
-
IMAGE_FSTYPES = "jffs2 tar"
ROOT_FLASH_SIZE = "100"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 6f06e54cdb..bf18b0837a 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -1,4 +1,6 @@
PREFERRED_PROVIDER_virtual/kernel = "c7x0-kernels-2.4-embedix"
+PREFERRED_PROVIDER_virtual/kernel_akita = "openzaurus-pxa27x"
+PREFERRED_PROVIDER_virtual/kernel_spitz = "openzaurus-pxa27x"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
pcmcia-cs apmd hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \
@@ -16,3 +18,14 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-modu
kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \
kernel-module-firmware-class kernel-module-bt3c-cs"
+
+# BI Module
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = "kernel-module-pxa-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = "kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = "kernel-module-pxa27x-bi"
+
+# USB Host Modules
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb kernel-module-bfusb"