Merge lp:~mvo/snappy-hub/bbb-env into lp:~snappy-dev/snappy-hub/snappy-systems

Proposed by Michael Vogt on 2015-07-16
Status: Merged
Approved by: Oliver Grawert on 2015-08-25
Approved revision: 12
Merged at revision: 9
Proposed branch: lp:~mvo/snappy-hub/bbb-env
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 119 lines (+74/-7)
4 files modified
beagleblack/README (+2/-0)
beagleblack/meta/package.yaml (+2/-1)
beagleblack/uEnv.txt (+0/-6)
beagleblack/uboot.env.in (+70/-0)
To merge this branch: bzr merge lp:~mvo/snappy-hub/bbb-env
Reviewer Review Type Date Requested Status
Snappy Developers 2015-07-16 Pending
Review via email: mp+264975@code.launchpad.net

Description of the change

Tiny branch that adds a new uboot.env so that we can use the env from
u-boot.

Merge should wait until we had a full end-to-end test.

To post a comment you must log in.
Oliver Grawert (ogra) wrote :

you might want to merge this together with https://code.launchpad.net/~ogra/snappy-hub/bbb-new-binaries-and-env/+merge/265375 and adjust the README to use uboot.env.in

Michael Vogt (mvo) wrote :

Thanks Oliver! I merged your stuff, added some more quoting and updated the README

lp:~mvo/snappy-hub/bbb-env updated on 2015-07-23
12. By Michael Vogt on 2015-07-23

update version

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-23 12:07:56 +0000 differ
3=== added file 'beagleblack/README'
4--- beagleblack/README 1970-01-01 00:00:00 +0000
5+++ beagleblack/README 2015-07-23 12:07:56 +0000
6@@ -0,0 +1,2 @@
7+uboot.env is created from uEnv.txt via:
8+$ mkenvimage -r -s 131072 -o uboot.env uboot.env.in
9
10=== modified file 'beagleblack/meta/package.yaml'
11--- beagleblack/meta/package.yaml 2015-06-30 17:54:39 +0000
12+++ beagleblack/meta/package.yaml 2015-07-23 12:07:56 +0000
13@@ -1,7 +1,7 @@
14 name: beagleblack
15 vendor: Sergio Schvezov <sergio.schvezov@canonical.com>
16 icon: meta/element14.png
17-version: 1.8
18+version: 1.11
19 type: oem
20
21 immutable-config:
22@@ -19,6 +19,7 @@
23 bootloader: u-boot
24 boot-assets:
25 files:
26+ - path: uboot.env
27 - path: uEnv.txt
28 raw-files:
29 - path: MLO
30
31=== modified file 'beagleblack/u-boot.img'
32Binary files beagleblack/u-boot.img 2015-04-22 15:46:27 +0000 and beagleblack/u-boot.img 2015-07-23 12:07:56 +0000 differ
33=== modified file 'beagleblack/uEnv.txt'
34--- beagleblack/uEnv.txt 2015-06-12 10:20:31 +0000
35+++ beagleblack/uEnv.txt 2015-07-23 12:07:56 +0000
36@@ -1,6 +0,0 @@
37-# where to load initrd
38-initrd_addr=0x88080000
39-# load Snappy environment and call into Snappy boot after processing this file
40-uenvcmd=load mmc ${bootpart} ${loadaddr} snappy-system.txt; env import -t $loadaddr $filesize; run snappy_boot
41-# boot from SD, ignoring eMMC (LP: #1464275)
42-bootpart=0:1
43
44=== added file 'beagleblack/uboot.env'
45Binary files beagleblack/uboot.env 1970-01-01 00:00:00 +0000 and beagleblack/uboot.env 2015-07-23 12:07:56 +0000 differ
46=== added file 'beagleblack/uboot.env.in'
47--- beagleblack/uboot.env.in 1970-01-01 00:00:00 +0000
48+++ beagleblack/uboot.env.in 2015-07-23 12:07:56 +0000
49@@ -0,0 +1,70 @@
50+arch=arm
51+baudrate=115200
52+board=am335x
53+boot_fdt=try
54+bootcmd=run findfdt; run mmcboot;setenv mmcdev 1; setenv bootpart 1:2; run mmcboot;run nandboot;
55+bootdelay=1
56+bootdir=/boot
57+bootenv=uEnv.txt
58+bootfile=zImage
59+bootm_size=0x10000000
60+bootpart=0:1
61+bootscript=echo Running bootscript from mmc${mmcdev} ...; source ${loadaddr}
62+console=ttyO0,115200n8
63+cpu=armv7
64+dfu_alt_info_emmc=rawemmc raw 0 3751936
65+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
66+dfu_alt_info_ram=kernel ram 0x80200000 0xD80000;fdt ram 0x80F80000 0x80000;ramdisk ram 0x81000000 0x4000000
67+fdt_addr_r=0x88000000
68+fdtaddr=0x88000000
69+fdtfile=am335x-boneblack.dtb
70+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;
71+importbootenv=echo Importing environment from mmc ...; env import -t -r $loadaddr $filesize
72+initrd_addr=0x88080000
73+initrd_file=initrd.img
74+kernel_addr_r=0x82000000
75+kernel_file=vmlinuz
76+loadaddr=0x82000000
77+loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}
78+loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
79+loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${snappy_ab}/dtbs/${fdtfile}
80+loadfiles=run loadkernel; run loadinitrd; run loadfdt
81+loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
82+loadinitrd=load mmc ${mmcdev}:${mmcpart} ${initrd_addr} ${snappy_ab}/${initrd_file}; setenv initrd_size ${filesize}
83+loadkernel=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${snappy_ab}/${kernel_file}
84+loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz
85+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
86+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;
87+mmcdev=0
88+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;
89+mmcroot=/dev/mmcblk0p2 ro
90+mmcrootfstype=ext4 rootwait
91+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
92+netboot=echo Booting from network ...; setenv autoload no; dhcp; run netloadimage; run netloadfdt; run netargs; bootz ${loadaddr} - ${fdtaddr}
93+netloadfdt=tftp ${fdtaddr} ${fdtfile}
94+netloadimage=tftp ${loadaddr} ${bootfile}
95+nfsopts=nolock
96+partitions=uuid_disk=${uuid_gpt_disk};name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}
97+ramargs=setenv bootargs console=${console} ${optargs} root=${ramroot} rootfstype=${ramrootfstype}
98+ramboot=echo Booting from ramdisk ...; run ramargs; bootz ${loadaddr} ${rdaddr} ${fdtaddr}
99+ramdisk_addr_r=0x88080000
100+ramroot=/dev/ram0 rw
101+ramrootfstype=ext2
102+rdaddr=0x88080000
103+rootpath=/export/rootfs
104+snappy_ab=a
105+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}
106+snappy_cmdline=init=/lib/systemd/systemd ro panic=-1 fixrtc
107+snappy_mode=regular
108+snappy_trial_boot=0
109+soc=am33xx
110+spiargs=setenv bootargs console=${console} ${optargs} root=${spiroot} rootfstype=${spirootfstype}
111+spiboot=echo Booting from spi ...; run spiargs; sf probe ${spibusno}:0; sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; bootz ${loadaddr}
112+spibusno=0
113+spiimgsize=0x362000
114+spiroot=/dev/mtdblock4 rw
115+spirootfstype=jffs2
116+spisrcaddr=0xe0000
117+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
118+uenvcmd=run snappy_boot
119+vendor=ti

Subscribers

People subscribed via source and target branches