kirkwood: clean up kernel and machine file a bit

diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 6ee50c1..be38858 100644 (file)
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -3,17 +3,15 @@
 
 TARGET_ARCH = "arm"
 
-MACHINE_FEATURES               = "kernel26 usbhost ext2 vfat"
+MACHINE_FEATURES               = "kernel26 usbhost ext2 vfat mmc"
 MACHINE_TASK_PROVIDER          = "task-base"
 
 USE_DEVFS = "0"
 
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
-PREFERRED_VERSION_linux-kirkwood = "2.6.29-rc7+git"
 
-IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
-IMAGE_FSTYPES = "tar.gz"
+IMAGE_FSTYPES += "tar.gz"
 SERIAL_CONSOLE = "ttyS0 115200"
 
 # Currently all the orion devices we support use uImage

diff --git a/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb b/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb
index 0515005..f870bce 100644 (file)
--- a/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb
@@ -6,6 +6,8 @@ COMPATIBLE_MACHINE = "sheevaplug"
 
 require linux.inc
 
+PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
+
 SRCREV = "569106c70e49ad67c69fa7d43a2a5218e63a4619"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git \
            file://fw.patch;patch=1 \