LAVA Validation Lab

Merge lp:~dpigott/lava-lab/correct-snowball-boot into lp:lava-lab

  1. correct-snowball-boot
  2. Merge into salt-states
Proposed by Dave Pigott
Status: Merged
Merged at revision: 93
Proposed branch: lp:~dpigott/lava-lab/correct-snowball-boot
Merge into: lp:lava-lab
Diff against target: 21 lines (+2/-2)
1 file modified
lava/device-types/snowball.conf (+2/-2)
To merge this branch: bzr merge lp:~dpigott/lava-lab/correct-snowball-boot
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+157418@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava/device-types/snowball.conf'
2--- lava/device-types/snowball.conf 2013-04-05 14:26:41 +0000
3+++ lava/device-types/snowball.conf 2013-04-05 15:52:44 +0000
4@@ -6,7 +6,7 @@
5 setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
6 bootm 0x00100000'",
7 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
8- root=/dev/mmcblk0p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
9+ root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
10 hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
11 boot
12
13@@ -17,7 +17,7 @@
14
15 boot_cmds_fdt = mmc rescan 1,
16 setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fatload mmc 1:3 0x01000000 /uInitrd; fatload mmc 1:3 0x00f00000 /board.dtb; bootm 0x00100000 0x01000000 0x00f00000'"
17- setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk0p5 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'",
18+ 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'",
19 boot
20
21 bootloader_prompt = $

Subscribers

People subscribed via source and target branches