diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 565: Switch snowball to use emmc

Message ID 20130314143018.349.42859.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Dave Pigott March 14, 2013, 2:30 p.m. UTC 
Merge authors:
  Dave Pigott (dpigott)
Related merge proposals:
  https://code.launchpad.net/~dpigott/lava-dispatcher/switch-snowball-to-emmc/+merge/153374
  proposed by: Dave Pigott (dpigott)
  review: Approve - Dave Pigott (dpigott)
------------------------------------------------------------
revno: 565 [merge]
committer: dave.pigott@linaro.org
branch nick: trunk
timestamp: Thu 2013-03-14 14:29:42 +0000
message:
  Switch snowball to use emmc
modified:
  lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-03-14 14:04:57 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-03-14 14:26:49 +0000
@@ -1,21 +1,19 @@ 
-boot_cmds = mmc init,
-    mmc rescan 1,
-    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
+boot_cmds = mmc rescan 0,
+    setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;
     bootm 0x00100000'",
     setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M 
-    root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M 
+    root=/dev/mmcblk0p5 rootwait mem=128M@0 mali.mali_mem=32M@128M 
     hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
     boot
 
-boot_cmds_android = mmc init,
-    mmc rescan 1,
-    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
+boot_cmds_android = mmc rescan 0,
+    setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
     setenv bootargs "'console=ttyAMA2,115200n8 rootwait ro earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=500M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'",
     boot
     
 bootloader_prompt = $
 
-lmc_dev_arg = snowball_sd
+lmc_dev_arg = snowball_emmc
 
 soft_boot_cmd = echo "Restarting system."
     echo 0x02 > /sys/kernel/debug/ab8500/register-bank
@@ -24,5 +22,5 @@ 
     echo 0x01 > /sys/kernel/debug/ab8500/register-address 
     echo 0x11 > /sys/kernel/debug/ab8500/register-value
 
-android_orig_block_device = mmcblk1
-android_lava_block_device = mmcblk1
+android_orig_block_device = mmcblk0
+android_lava_block_device = mmcblk0