summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-23 13:58:54 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-23 13:58:54 +0200
commit3ec8b29b0f9435cde29f07e2bcc2c4ec0c1ac5f6 (patch)
tree7c91692f211d990b928b0481c2c2384f2d9e3395
parent3f7b4e51b008bfaefc70eabe073c37eeef9ef355 (diff)
parentb72810f7fce6b112bdceb23c06425106f58b1450 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/linux/openezx-kernel_git.bb10
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a26dbe3214..a8e7745dd6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -154,7 +154,7 @@ SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191"
+SRCREV_pn-openezx-kernel ?= "b53ea978de2a628f61f8e24e584c11dc90df3d39"
SRCREV_pn-openmoko-agpsui ?= "7"
SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
SRCREV_pn-openmoko-appearance ?= "3262"
diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb
index 04044131b2..e212a5473b 100644
--- a/recipes/linux/openezx-kernel_git.bb
+++ b/recipes/linux/openezx-kernel_git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM phones"
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
-KV = "2.6.28+2.6.29rc8"
+KV = "2.6.29+2.6.30rc2"
PV = "${KV}+gitr${SRCREV}"
PR = "r0"
@@ -17,14 +17,14 @@ SRC_URI = "\
S = "${WORKDIR}/git"
##############################################################
-# kernel image resides on a seperate flash partition (for now)
-# But we can flash it from userspace (flash_unlock /dev/mtdX && flash_eraseall /dev/mtdX && flashcp /boot/zImage /dev/mtdX)
-# so lets make a package of it. What about a postinst that flashes the new kernel?
+# The kernel image used to reside on a seperate flash partition
+# It can be flashed from userspace, so we should package it anyways
+# (flash_unlock /dev/mtdX && flash_eraseall /dev/mtdX && flashcp /boot/zImage /dev/mtdX)
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = '(a780|e680|a910|a1200|rorkre2|rokre6)'
-# Kernel command line parameters are given over boot_usb or gen-blob's menu
+# The Kernel command line parameters are given via boot_usb or gen-blob
###############################################################
# module configs specific to this kernel