LAVA Dispatcher

Merge lp:~dpigott/lava-dispatcher/update-snowball-uboot-config into lp:lava-dispatcher

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

Description of the change

It looks like, for newer u-boot, the command "fat load" has been coalesced into "fatload" - change in the config

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

On Thu, Mar 14, 2013 at 02:08:21PM -0000, Dave Pigott wrote:
> === 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 2013-03-14 14:07:25 +0000
> @@ -1,6 +1,6 @@
> boot_cmds = mmc init,
> mmc rescan 1,
> - setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage;
> + setenv bootcmd "'fatload 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
> @@ -9,7 +9,7 @@
>
> boot_cmds_android = mmc init,
> mmc rescan 1,
> - setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
> + setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
                                                             ^^^^^^^^
You missed one there

--
Antonio Terceiro
Software Engineer - Linaro
http://www.linaro.org

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/snowball.conf'
2--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2012-12-13 22:04:36 +0000
3+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-03-14 14:12:21 +0000
4@@ -1,6 +1,6 @@
5 boot_cmds = mmc init,
6 mmc rescan 1,
7- setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage;
8+ setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
9 bootm 0x00100000'",
10 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
11 root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
12@@ -9,7 +9,7 @@
13
14 boot_cmds_android = mmc init,
15 mmc rescan 1,
16- setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
17+ setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
18 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'",
19 boot
20

Subscribers

People subscribed via source and target branches