[oe-commits] org.oe.dev collie: added 2.4/2.6 kernel switch from .oz354x

[hrw commit]

collie: added 2.4/2.6 kernel switch from .oz354x
- 2.4 kernel is default
- I do not want to use include/zaurus-2.6.conf as it is too PXA related

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 02f0d5fddf858a7c968f6aa8a0733e64c373840d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=02f0d5fddf858a7c968f6aa8a0733e64c373840d
Files:
1
conf/machine/include/collie-2.4.conf
conf/machine/include/collie-2.6.conf
conf/machine/collie.conf
Diffs:

#
# mt diff -r4388a6b99de31cf7e9bb5af3a124ae80c52e796c -r02f0d5fddf858a7c968f6aa8a0733e64c373840d
#
# 
# 
# add_file "conf/machine/include/collie-2.4.conf"
#  content [946986a35226dc890efe5812f258ca7224219154]
# 
# add_file "conf/machine/include/collie-2.6.conf"
#  content [7bb098a03cc76867b7ae4c7c0747a8e973de3182]
# 
# patch "conf/machine/collie.conf"
#  from [0190bba209cd7c4ddc5432901d297315c6900880]
#    to [515a699feadd19aa57f7e26c0bad5b558b087e9d]
# 
============================================================
--- conf/machine/include/collie-2.4.conf	946986a35226dc890efe5812f258ca7224219154
+++ conf/machine/include/collie-2.4.conf	946986a35226dc890efe5812f258ca7224219154
@@ -0,0 +1,16 @@
+PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
+
+#
+# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
+# no usbgadget feature because 2.4 kernel handle it in own way on each machine
+#
+MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
+                             kernel-module-usbdcore kernel-module-usbdmonitor \
+                             sharp-sdmmc-support"
+
+# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
============================================================
--- conf/machine/include/collie-2.6.conf	7bb098a03cc76867b7ae4c7c0747a8e973de3182
+++ conf/machine/include/collie-2.6.conf	7bb098a03cc76867b7ae4c7c0747a8e973de3182
@@ -0,0 +1,3 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
============================================================
--- conf/machine/collie.conf	0190bba209cd7c4ddc5432901d297315c6900880
+++ conf/machine/collie.conf	515a699feadd19aa57f7e26c0bad5b558b087e9d
@@ -1,22 +1,14 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
 
-#
-# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
-# no usbgadget feature because 2.4 kernel handle it in own way on each machine
-#
-MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
-
 # This is needed for the ramdisk script to work
 MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
@@ -24,6 +16,8 @@ IMAGE_LINGUAS = ""
 
 IMAGE_LINGUAS = ""
 
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
 include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -31,7 +25,5 @@ ROOT_FLASH_SIZE = "14"
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
 MACHINE_TASK_PROVIDER = "task-base"
+GUI_MACHINE_CLASS_poodle = "smallscreen"