diff options
Diffstat (limited to 'conf/machine/collie.conf')
| -rw-r--r-- | conf/machine/collie.conf | 15 |
1 files changed, 5 insertions, 10 deletions
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" |