aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-02-04 23:49:21 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-07 18:18:53 +0000
commit01f3e2c1be8f7e8a3b5c417a4e1a48c79dbf69dd (patch)
treeb418042f76b6b18b623e71eb7998ed910a4012b1 /conf
parent08855d4a059a1fa19f77a83978ea8cfb0067069d (diff)
downloadmeta-handheld-01f3e2c1be8f7e8a3b5c417a4e1a48c79dbf69dd.tar.gz
zaurus.inc: remove remnant of kernel26 from MACHINE_FEATURES
* 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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/zaurus.inc8
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