[oe-commits] org.oe.oz354x collie.conf:split to 2.4/2.6 configs

[hrw commit]

collie.conf:split to 2.4/2.6 configs

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 6f64da16bca2a018947687733daea08b9ff6c0e3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6f64da16bca2a018947687733daea08b9ff6c0e3
Files:
1
conf/machine/collie-2.4.conf
conf/machine/collie-2.6.conf
conf/machine/collie.conf
Diffs:

#
# mt diff -r4c1822157997ecb2d39f051afd9e7be841eb6924 -r6f64da16bca2a018947687733daea08b9ff6c0e3
#
# 
# 
# add_file "conf/machine/collie-2.4.conf"
#  content [256dfceee75ea0d47dbb8c6bfb7bcc6606c1fd89]
# 
# add_file "conf/machine/collie-2.6.conf"
#  content [8e1862bf8fbb871b853dfe8ad6fe0ae0eb8ed5c3]
# 
# patch "conf/machine/collie.conf"
#  from [f48572f88028f7db471d4288e9ceb5fb9b5737fb]
#    to [7136b76c5fdc71d533fb4bc2283280a647ada864]
# 
============================================================
--- conf/machine/collie-2.4.conf	256dfceee75ea0d47dbb8c6bfb7bcc6606c1fd89
+++ conf/machine/collie-2.4.conf	256dfceee75ea0d47dbb8c6bfb7bcc6606c1fd89
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
+BOOTSTRAP_EXTRA_DEPENDS += "hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \
+							   sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \
+							   kernel-module-usbdcore kernel-module-usbdmonitor"
+
+# 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/collie-2.6.conf	8e1862bf8fbb871b853dfe8ad6fe0ae0eb8ed5c3
+++ conf/machine/collie-2.6.conf	8e1862bf8fbb871b853dfe8ad6fe0ae0eb8ed5c3
@@ -0,0 +1,2 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
============================================================
--- conf/machine/collie.conf	f48572f88028f7db471d4288e9ceb5fb9b5737fb
+++ conf/machine/collie.conf	7136b76c5fdc71d533fb4bc2283280a647ada864
@@ -1,19 +1,17 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 #@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"
 IPKG_ARCHS = "all arm ${MACHINE}"
+
+ZKERNEL_VERSION ?= "2.6"
+include conf/machine/collie-${ZKERNEL_VERSION}.conf
+
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel altboot"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel altboot"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \
-sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor"
 
-# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
-
 # This is needed for the ramdisk script to work
 BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
 BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
@@ -28,6 +26,3 @@ ROOT_FLASH_SIZE = "16"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 ROOT_FLASH_SIZE = "16"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"