Merge lp:~ogra/snappy-hub/bbb-new-binaries-and-env into lp:~snappy-dev/snappy-hub/snappy-systems

Proposed by Oliver Grawert on 2015-07-21
Status: Merged
Merged at revision: 9
Proposed branch: lp:~ogra/snappy-hub/bbb-new-binaries-and-env
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 89 lines (+70/-6)
2 files modified
beagleblack/uEnv.txt (+0/-6)
beagleblack/uboot.env.in (+70/-0)
To merge this branch: bzr merge lp:~ogra/snappy-hub/bbb-new-binaries-and-env
Reviewer Review Type Date Requested Status
Michael Vogt 2015-07-21 Pending
Review via email: mp+265375@code.launchpad.net

Commit message

add new u-boot.img and MLO binaries, based on upstream 2015.07 with patch http://paste.ubuntu.com/11893731/ applied. add uboot.env.in file as input to mkenvimage to create a proper binary environment file in the snap

Description of the change

add new u-boot.img and MLO binaries, based on upstream 2015.07 with patch http://paste.ubuntu.com/11893731/ applied. add uboot.env.in file as input to mkenvimage to create a proper binary environment file in the snap

To post a comment you must log in.
Ricardo Salveti (rsalveti) wrote :

Do we want to blindly include everything? Don't see why we need the networking related options, for example.

Oliver Grawert (ogra) wrote :

> Do we want to blindly include everything? Don't see why we need the networking
> related options, for example.

loading the uboot.env file wipes the complete default environment of uboot, i guess we should keep the hardcoded defaults which is why i pulled them in from the code ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'beagleblack/MLO'
2Binary files beagleblack/MLO 2015-04-22 15:46:27 +0000 and beagleblack/MLO 2015-07-21 09:21:07 +0000 differ
3=== modified file 'beagleblack/u-boot.img'
4Binary files beagleblack/u-boot.img 2015-04-22 15:46:27 +0000 and beagleblack/u-boot.img 2015-07-21 09:21:07 +0000 differ
5=== modified file 'beagleblack/uEnv.txt'
6--- beagleblack/uEnv.txt 2015-06-12 10:20:31 +0000
7+++ beagleblack/uEnv.txt 2015-07-21 09:21:07 +0000
8@@ -1,6 +0,0 @@
9-# where to load initrd
10-initrd_addr=0x88080000
11-# load Snappy environment and call into Snappy boot after processing this file
12-uenvcmd=load mmc ${bootpart} ${loadaddr} snappy-system.txt; env import -t $loadaddr $filesize; run snappy_boot
13-# boot from SD, ignoring eMMC (LP: #1464275)
14-bootpart=0:1
15
16=== added file 'beagleblack/uboot.env.in'
17--- beagleblack/uboot.env.in 1970-01-01 00:00:00 +0000
18+++ beagleblack/uboot.env.in 2015-07-21 09:21:07 +0000
19@@ -0,0 +1,70 @@
20+arch=arm
21+baudrate=115200
22+board=am335x
23+boot_fdt=try
24+bootcmd=run findfdt; run mmcboot;setenv mmcdev 1; setenv bootpart 1:2; run mmcboot;run nandboot;
25+bootdelay=1
26+bootdir=/boot
27+bootenv=uEnv.txt
28+bootfile=zImage
29+bootm_size=0x10000000
30+bootpart=0:1
31+bootscript=echo Running bootscript from mmc${mmcdev} ...; source ${loadaddr}
32+console=ttyO0,115200n8
33+cpu=armv7
34+dfu_alt_info_emmc=rawemmc raw 0 3751936
35+dfu_alt_info_mmc=boot part 0 1;rootfs part 0 2;MLO fat 0 1;MLO.raw raw 0x100 0x100;u-boot.img.raw raw 0x300 0x400;spl-os-args.raw raw 0x80 0x80;spl-os-image.raw raw 0x900 0x2000;spl-os-args fat 0 1;spl-os-image fat 0 1;u-boot.img fat 0 1;uEnv.txt fat 0 1
36+dfu_alt_info_ram=kernel ram 0x80200000 0xD80000;fdt ram 0x80F80000 0x80000;ramdisk ram 0x81000000 0x4000000
37+fdt_addr_r=0x88000000
38+fdtaddr=0x88000000
39+fdtfile=am335x-boneblack.dtb
40+findfdt=if test $board_name = A335BONE; then setenv fdtfile am335x-bone.dtb; fi; if test $board_name = A335BNLT; then setenv fdtfile am335x-boneblack.dtb; fi; if test $board_name = A33515BB; then setenv fdtfile am335x-evm.dtb; fi; if test $board_name = A335X_SK; then setenv fdtfile am335x-evmsk.dtb; fi; if test $fdtfile = undefined; then echo WARNING: Could not determine device tree to use; fi;
41+importbootenv=echo Importing environment from mmc ...; env import -t -r $loadaddr $filesize
42+initrd_addr=0x88080000
43+initrd_file=initrd.img
44+kernel_addr_r=0x82000000
45+kernel_file=vmlinuz
46+loadaddr=0x82000000
47+loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}
48+loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
49+loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${snappy_ab}/dtbs/${fdtfile}
50+loadfiles=run loadkernel; run loadinitrd; run loadfdt
51+loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
52+loadinitrd=load mmc ${mmcdev}:${mmcpart} ${initrd_addr} ${snappy_ab}/${initrd_file}; setenv initrd_size ${filesize}
53+loadkernel=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${snappy_ab}/${kernel_file}
54+loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz
55+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
56+mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootscript; then run bootscript;else if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run mmcloados;fi;fi ;fi;
57+mmcdev=0
58+mmcloados=run mmcargs; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if run loadfdt; then bootz ${loadaddr} - ${fdtaddr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi;
59+mmcroot=/dev/mmcblk0p2 ro
60+mmcrootfstype=ext4 rootwait
61+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
62+netboot=echo Booting from network ...; setenv autoload no; dhcp; run netloadimage; run netloadfdt; run netargs; bootz ${loadaddr} - ${fdtaddr}
63+netloadfdt=tftp ${fdtaddr} ${fdtfile}
64+netloadimage=tftp ${loadaddr} ${bootfile}
65+nfsopts=nolock
66+partitions=uuid_disk=${uuid_gpt_disk};name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}
67+ramargs=setenv bootargs console=${console} ${optargs} root=${ramroot} rootfstype=${ramrootfstype}
68+ramboot=echo Booting from ramdisk ...; run ramargs; bootz ${loadaddr} ${rdaddr} ${fdtaddr}
69+ramdisk_addr_r=0x88080000
70+ramroot=/dev/ram0 rw
71+ramrootfstype=ext2
72+rdaddr=0x88080000
73+rootpath=/export/rootfs
74+snappy_ab=a
75+snappy_boot=if test "${snappy_mode}" = "try"; then if test ${snappy_trial_boot} = 1; then if test "${snappy_ab}" = "a"; then setenv snappy_ab "b"; else setenv snappy_ab "a"; fi; else setenv snappy_trial_boot 1; saveenv; fi; fi; run loadfiles; setenv mmcroot /dev/disk/by-label/system-${snappy_ab} ${snappy_cmdline}; run mmcargs; bootz ${loadaddr} ${initrd_addr}:${initrd_size} ${fdtaddr}
76+snappy_cmdline=init=/lib/systemd/systemd ro panic=-1 fixrtc
77+snappy_mode=regular
78+snappy_trial_boot=0
79+soc=am33xx
80+spiargs=setenv bootargs console=${console} ${optargs} root=${spiroot} rootfstype=${spirootfstype}
81+spiboot=echo Booting from spi ...; run spiargs; sf probe ${spibusno}:0; sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; bootz ${loadaddr}
82+spibusno=0
83+spiimgsize=0x362000
84+spiroot=/dev/mtdblock4 rw
85+spirootfstype=jffs2
86+spisrcaddr=0xe0000
87+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
88+uenvcmd=run snappy_boot
89+vendor=ti

Subscribers

People subscribed via source and target branches