diff options
| author |   Marcin Juszkiewicz <hrw@openembedded.org> | 2006-08-22 17:02:34 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-08-22 17:02:34 +0000 |
| commit | 4c38aa824c61147723c7696f5c2cbf383631b022 (patch) | |
| tree | ae56844ec67b279374b442b7eeb560ff16de476c /conf | |
| parent | 8ee7df95c034d30e4c1646355e6fd042a8bceede (diff) | |
| download | openembedded-4c38aa824c61147723c7696f5c2cbf383631b022.tar.gz | |
collie.conf:split to 2.4/2.6 configs
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/collie-2.4.conf | 10 | ||||
| -rw-r--r-- | conf/machine/collie-2.6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/collie.conf | 15 |
3 files changed, 17 insertions, 10 deletions
diff --git a/conf/machine/collie-2.4.conf b/conf/machine/collie-2.4.conf new file mode 100644 index 0000000000..dc6806c3e8 --- /dev/null +++ b/conf/machine/collie-2.4.conf @@ -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" diff --git a/conf/machine/collie-2.6.conf b/conf/machine/collie-2.6.conf new file mode 100644 index 0000000000..915c7e3d3d --- /dev/null +++ b/conf/machine/collie-2.6.conf @@ -0,0 +1,2 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" + diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 8623cdbc14..ebe33e87cd 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -4,15 +4,13 @@ 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" @@ -28,6 +26,3 @@ include conf/machine/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" ROOT_FLASH_SIZE = "16" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" |