diff options
| author |   Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-29 20:30:32 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-29 20:30:32 +0000 |
| commit | 095d2f2f4a11a28edf7dfdc2d80d31695db479f8 (patch) | |
| tree | c9b65b564ed8096ada88c30bed429cdb2f06c7f2 /conf/machine/collie.conf | |
| parent | d77ab609a4793164b198a60de58699eeec1263be (diff) | |
| download | openembedded-095d2f2f4a11a28edf7dfdc2d80d31695db479f8.tar.gz | |
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
Diffstat (limited to 'conf/machine/collie.conf')
| -rw-r--r-- | conf/machine/collie.conf | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index deefa1b698..170d90db7c 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,19 +3,11 @@ #@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" - -# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied +PREFERRED_PROVIDER_xserver = "xserver-kdrive" # This is needed for the ramdisk script to work MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" @@ -24,6 +16,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" +IMAGE_FSTYPES ?= "jffs2 tar.gz" + include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" @@ -31,7 +25,5 @@ SERIAL_CONSOLE = "115200 ttyS0" 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" |