Merge lp:~fboudra/lava-dispatcher/load-uinitrd-ubuntu into lp:lava-dispatcher

[Fathi Boudra]

Snowball boot_cmds: sync with current configuration and load uInitrd.

[Andy Doan (doanac)]

seems fine. would you like me to cut a new dispatcher release so it can land this month?

[Fathi Boudra (fboudra)]

On 17 December 2012 23:04, Andy Doan <email address hidden> wrote:
> seems fine. would you like me to cut a new dispatcher release so it can land this month?

It will be awesome. Thanks Andy!

[lp:~fboudra/lava-dispatcher/load-uinitrd-ubuntu]

506. By Fathi Boudra on 2012-12-17

fix fatload syntax

[Michael Hudson-Doyle (mwhudson)]

Unfortunately nothing in life is simple. It turns out that this change _only_ works with jobs that provide an initrd and the current snowball health jobs do not. So either we have a grotty flag day or we do something to properly handle images that both provide an initrd and do not (and same for dtb). Or we wait for sdmux...

Unmerged revisions

506. By Fathi Boudra on 2012-12-17

fix fatload syntax

505. By Fathi Boudra on 2012-12-17

Fix Snowball configuration for Ubuntu: load uInitrd

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2012-12-13 22:04:36 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2012-12-17 23:02:23 +0000
@@ -1,10 +1,7 @@
 boot_cmds = mmc init,
     mmc rescan 1,
-    setenv bootcmd "'fat load mmc 1: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 
-    hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
+    setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x01000000 /uInitrd; bootm 0x00100000 0x01000000'"
+    setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 rootwait ro fixrtc nocompcache vmalloc=300M 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,