LAVA Dispatcher

Merge lp:~dpigott/lava-dispatcher/fix-arndale-mmc into lp:lava-dispatcher

  1. fix-arndale-mmc
  2. Merge into trunk
Proposed by Dave Pigott
Status: Merged
Merged at revision: 591
Proposed branch: lp:~dpigott/lava-dispatcher/fix-arndale-mmc
Merge into: lp:lava-dispatcher
Diff against target: 24 lines (+4/-4)
1 file modified
lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf (+4/-4)
To merge this branch: bzr merge lp:~dpigott/lava-dispatcher/fix-arndale-mmc
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+161076@code.launchpad.net

Description of the change

For some reason, which I have yet to understand, all the arndales moved overnight from using mmcblk0 to mmcblk1. I've updated salt, but somehow the changed config didn't get picked up by the production dispatcher. This is the only other place I can see that it can pick it up from, but I'm sure that the one in /srv/lava/instances/production/etc/production/device-types/arndale.conf is the one that would supercede all the others. It's worked in the past!

To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve
Revision history for this message
Dave Pigott (dpigott) wrote :

ok - this and other issues are all now understood. We now read the boot commands from boot.txt and adapt them. The adapt code was wrong.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf'
2--- lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-01-28 14:16:49 +0000
3+++ lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-04-26 09:14:25 +0000
4@@ -1,8 +1,8 @@
5 boot_part = 2
6 root_part = 3
7 boot_cmds = mmc rescan,
8- mmc part 0,
9- setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",
10+ mmc part 1,
11+ setenv bootcmd "'fatload mmc 1:5 0x40007000 uImage; fatload mmc 1:5 0x42000000 uInitrd; fatload mmc 1:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",
12 setenv bootargs "'console=ttySAC2,115200n8 root=LABEL=testrootfs rootwait ro'",
13 boot
14
15@@ -19,8 +19,8 @@
16 data_part_android = 7
17
18 boot_cmds_android = mmc init,
19- mmc part 0,
20- setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage;fatload mmc 0:5 0x42000000 uInitrd; bootm 0x40007000 0x42000000'",
21+ mmc part 1,
22+ setenv bootcmd "'fatload mmc 1:5 0x40007000 uImage;fatload mmc 1:5 0x42000000 uInitrd; bootm 0x40007000 0x42000000'",
23 setenv bootargs "'console=ttySAC2,115200n8 rootwait ro init=/init androidboot.console=ttySAC2'",
24 boot
25

Subscribers

People subscribed via source and target branches