[oe-commits] Martin Jansa : u-boot: switch root= from mmcblk1 to mmcblk0 in shr config

[git version control]

Module: openembedded.git
Branch: master
Commit: daab5afcad63ccb9fa4029a628d50012728f430d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=daab5afcad63ccb9fa4029a628d50012728f430d

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri May  6 09:15:46 2011 +0200

u-boot: switch root= from mmcblk1 to mmcblk0 in shr config

* PR wasn't bumped because other distributions/machines don't deserve
  needless noise without any change for them (and I've already built
  newer u-boot for SHR)

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

---

 ...ia_rx51.h-start-shr-as-default-and-change.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/u-boot/u-boot-git/nokia900/0001-configs-nokia_rx51.h-start-shr-as-default-and-change.patch b/recipes/u-boot/u-boot-git/nokia900/0001-configs-nokia_rx51.h-start-shr-as-default-and-change.patch
index 6bc91f6..1c6a46e 100644
--- a/recipes/u-boot/u-boot-git/nokia900/0001-configs-nokia_rx51.h-start-shr-as-default-and-change.patch
+++ b/recipes/u-boot/u-boot-git/nokia900/0001-configs-nokia_rx51.h-start-shr-as-default-and-change.patch
@@ -34,7 +34,7 @@ index 5c3b068..62770c9 100644
 -		"bootm ${loadaddr}\0" \
 -	"noloboot=echo Booting NOLO supplied kernel ...; " \
 +	"meegoargs=root=/dev/mmcblk0p2 rootwait console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 nosplash\0" \
-+	"shrargs=snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6 console=tty1 root=/dev/mmcblk1p1 rootwait panic=20 debug\0" \
++	"shrargs=snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6 console=tty1 root=/dev/mmcblk0p1 rootwait panic=20 debug\0" \
 +	"boot1stcmd=mmc init; ext2load mmc 0:1 0x82000000 /boot/uImage; bootm 0x82000000\0" \
 +	"boot3rdcmd=mmc init; fatload mmc 0:3 0x82000000 uImage; bootm 0x82000000\0" \
 +	"shr=echo Booting SHR from uSD 1st part (/boot/uImage) ...; " \