diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2009-05-24 00:06:03 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2009-05-24 00:08:42 +0200 |
| commit | bc8de04dc0375272fcd6ea50b1ca72e92711cb57 (patch) | |
| tree | e06138aaea9ee1ea6268ef39e8d5b5e3b94ca1d8 /conf/machine/include | |
| parent | 22069bb987b0076b6cae30d8f93153ef91a91657 (diff) | |
zaurus-2.6.inc: reorder common include - readd collie and tosa specific bits - add MACHINE_KERNEL_PR
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 22 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-kernel.inc | 18 |
2 files changed, 28 insertions, 12 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index c6dafc19d9..a8c564f4da 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,10 +1,8 @@ -# Zaurus specific configuration for kernel 2.6 +# Zaurus common settings # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION = "2.6" - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" @@ -17,34 +15,34 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" PCMCIA_MANAGER ?= "pcmciautils" IMAGE_FSTYPES += "jffs2" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd mtd-utils" -# Fixme ? -######### +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -KERNEL_IMAGE_MAXSIZE = "1294336" - -ZAURUS_KERNEL_IMAGETYPE ?= "zImage" -KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" +# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup +# Fixme ? module-snd for tosa +MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" +require conf/machine/include/zaurus-kernel.inc require conf/machine/include/kexecboot.inc diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc new file mode 100644 index 0000000000..f63af74405 --- /dev/null +++ b/conf/machine/include/zaurus-kernel.inc @@ -0,0 +1,18 @@ +# Zaurus common kernel settings + +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel_collie = "linux" +PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" + +# Increase PR everytime you change something in the kernel +MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR_collie = "r8" +MACHINE_KERNEL_PR_tosa = "r4" + +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" |