From bc8de04dc0375272fcd6ea50b1ca72e92711cb57 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 24 May 2009 00:06:03 +0200 Subject: zaurus-2.6.inc: reorder common include - readd collie and tosa specific bits - add MACHINE_KERNEL_PR --- conf/machine/collie.conf | 24 +++--------------------- conf/machine/include/zaurus-2.6.inc | 22 ++++++++++------------ conf/machine/include/zaurus-kernel.inc | 18 ++++++++++++++++++ conf/machine/tosa.conf | 4 ---- 4 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 conf/machine/include/zaurus-kernel.inc (limited to 'conf/machine') diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 96f430f377..47f6e30dfd 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -2,35 +2,17 @@ #@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" +require conf/machine/include/zaurus-2.6.inc require conf/machine/include/tune-strongarm.inc -MACHINE_KERNEL_VERSION = "2.6" -KERNEL_IMAGE_MAXSIZE = "1048576" -KERNEL_IMAGETYPE = "zImage" -SERIAL_CONSOLE = "115200 ttySA0" - ROOT_FLASH_SIZE = "14" -# actually 14680064, see EXTRA_IMAGECMD - -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - -XSERVER ?= "xserver-kdrive-fbdev" - +# actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -IMAGE_LINGUAS ?= "" -IMAGE_FSTYPES ?= "jffs2 tar.gz" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" +XSERVER = "xserver-kdrive-fbdev" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "270" MACHINE_DISPLAY_PPI = "114" - -require conf/machine/include/kexecboot.inc 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}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 87cfe4781a..fd1e477465 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,10 +5,6 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/tune-xscale.inc -# wlan-ng Modules -# OHCI suspend/resume fixup -MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix" - ROOT_FLASH_SIZE = "28" MACHINE_GUI_CLASS = "bigscreen" -- cgit v1.2.3