[oe-commits] Martin Jansa : linux_2.6.35: use mmcblk1p1 for rootfs on nokia900

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 4247d8ca5b818a9b0409667d67b534cead00cb69
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4247d8ca5b818a9b0409667d67b534cead00cb69

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Dec 27 13:13:44 2010 +0100

linux_2.6.35: use mmcblk1p1 for rootfs on nokia900

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/nokia900.conf    |    2 +-
 recipes/linux/linux_2.6.35.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index 2bec4aa..484b1a9 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -76,4 +76,4 @@ module_autoload_g_ether = "g_ether"
 # Copied from include/omap3.inc (as we do not use linux-omap recipes):
 #
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r56"
+MACHINE_KERNEL_PR = "r57"
diff --git a/recipes/linux/linux_2.6.35.bb b/recipes/linux/linux_2.6.35.bb
index f0e6644..2653e98 100644
--- a/recipes/linux/linux_2.6.35.bb
+++ b/recipes/linux/linux_2.6.35.bb
@@ -116,7 +116,7 @@ SRC_URI_nokia900 = "\
 	file://inconsistent-mmc-fix-2.6.35.patch \
 	file://defconfig "
 
-CMDLINE_nokia900_shr = "snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6 console=tty1 root=/dev/mmcblk1p2 rootwait panic=20 debug"
+CMDLINE_nokia900_shr = "snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6 console=tty1 root=/dev/mmcblk1p1 rootwait panic=20 debug"
 
 SRC_URI[kernel.md5sum] = "091abeb4684ce03d1d936851618687b6"
 SRC_URI[kernel.sha256sum] = "18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf"