Merge lp:~dpigott/lava-dispatcher/correct-more-fatload into lp:lava-dispatcher

Proposed by Dave Pigott on 2013-03-14
Status: Rejected
Rejected by: Neil Williams on 2014-07-02
Proposed branch: lp:~dpigott/lava-dispatcher/correct-more-fatload
Merge into: lp:lava-dispatcher
Diff against target: 11 lines (+1/-1)
1 file modified
lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf (+1/-1)
To merge this branch: bzr merge lp:~dpigott/lava-dispatcher/correct-more-fatload
Reviewer Review Type Date Requested Status
Antonio Terceiro 2013-03-14 Approve on 2013-03-15
Review via email: mp+153385@code.launchpad.net
To post a comment you must log in.
Antonio Terceiro (terceiro) wrote :

 review approve

> === 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:26:49 +0000
> +++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-03-14 15:05:42 +0000
> @@ -7,7 +7,7 @@
> boot
>
> 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 bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fatload 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

Sounds good.

However, now this got me thinking: with this change, we are effectively
breaking the setup of anyone that is using the older master images with
the older U-Boot.

That said, since we should be reading the boot command from the
image anyway, I don't think that is so grave.

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

review: Approve

Unmerged revisions

566. By Dave Pigott on 2013-03-14

Correct more fat load errors

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 2013-03-14 14:26:49 +0000
3+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-03-14 15:05:42 +0000
4@@ -7,7 +7,7 @@
5 boot
6
7 boot_cmds_android = mmc rescan 0,
8- setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
9+ setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fatload mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
10 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'",
11 boot
12

Subscribers

People subscribed via source and target branches