[meta-handheld][PATCH] zaurus.inc: remove remnant of kernel26 from MACHINE_FEATURES

[meta-handheld][PATCH] zaurus.inc: remove remnant of kernel26 from MACHINE_FEATURES

[Andrea Adami]

* and do some minor cleanings, removing unneeded var for kernel type
* remove outdated comments about tosa suspend as well

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/include/zaurus.inc |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc
index 099bb3e..a43db8b 100644
--- a/conf/machine/include/zaurus.inc
+++ b/conf/machine/include/zaurus.inc
@@ -35,8 +35,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 # Default bootloader expects "zImage", use "uImage" for u-boot
 # Note: kexecboot can boot both kind of images
-ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
+KERNEL_IMAGETYPE ?= "zImage"
 
 # sane defaults for devices with only 32Mb RAM (see man xz)
 XZ_COMPRESSION_LEVEL = "-e -7"
@@ -60,7 +59,7 @@ CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
+MACHINE_FEATURES = "apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_akita = " usbhost"
 MACHINE_FEATURES_append_spitz = " usbhost"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
@@ -68,9 +67,6 @@ MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
 MACHINE_EXTRA_RDEPENDS_collie = "zaurusd"
 
-# Still actual? OHCI suspend/resume fixup
-# MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
-
 ##################################
 # Zaurus rootfs are booted by
 # linux-kexecboot
-- 
1.7.3.4

Re: [meta-handheld][PATCH] zaurus.inc: remove remnant of kernel26 from MACHINE_FEATURES

[Paul Eggleton]

On Saturday 04 February 2012 23:49:21 Andrea Adami wrote:
> * and do some minor cleanings, removing unneeded var for kernel type
> * remove outdated comments about tosa suspend as well
> 
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  conf/machine/include/zaurus.inc |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/conf/machine/include/zaurus.inc
> b/conf/machine/include/zaurus.inc index 099bb3e..a43db8b 100644
> --- a/conf/machine/include/zaurus.inc
> +++ b/conf/machine/include/zaurus.inc
> @@ -35,8 +35,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
> 
>  # Default bootloader expects "zImage", use "uImage" for u-boot
>  # Note: kexecboot can boot both kind of images
> -ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
> -KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
> +KERNEL_IMAGETYPE ?= "zImage"
> 
>  # sane defaults for devices with only 32Mb RAM (see man xz)
>  XZ_COMPRESSION_LEVEL = "-e -7"
> @@ -60,7 +59,7 @@ CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1
> fbcon=rotate:1" CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1
> fbcon=rotate:1" CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1"
> 
> -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard
> touchscreen screen vfat ext2" +MACHINE_FEATURES = "apm alsa pcmcia irda
> usbgadget keyboard touchscreen screen vfat ext2"
> MACHINE_FEATURES_append_akita = " usbhost"
>  MACHINE_FEATURES_append_spitz = " usbhost"
>  MACHINE_FEATURES_append_tosa  = " usbhost wifi "
> @@ -68,9 +67,6 @@ MACHINE_FEATURES_append_tosa  = " usbhost wifi "
>  MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
>  MACHINE_EXTRA_RDEPENDS_collie = "zaurusd"
> 
> -# Still actual? OHCI suspend/resume fixup
> -# MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
> -
>  ##################################
>  # Zaurus rootfs are booted by
>  # linux-kexecboot

All three of the zaurus.inc patches merged to meta-handheld. Thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre