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

[Michael Vogt]

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.

[Oliver Grawert (ogra)]

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)]

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

[lp:~mvo/snappy-hub/bbb-env]

12. By Michael Vogt on 2015-07-23

update version

=== modified file 'beagleblack/MLO'
 Binary files beagleblack/MLO	2015-04-22 15:46:27 +0000 and beagleblack/MLO	2015-07-23 12:07:56 +0000 differ
=== added file 'beagleblack/README'
--- beagleblack/README	1970-01-01 00:00:00 +0000
+++ beagleblack/README	2015-07-23 12:07:56 +0000
@@ -0,0 +1,2 @@
+uboot.env is created from uEnv.txt via:
+$ mkenvimage -r -s 131072  -o uboot.env uboot.env.in
 
=== modified file 'beagleblack/meta/package.yaml'
--- beagleblack/meta/package.yaml	2015-06-30 17:54:39 +0000
+++ beagleblack/meta/package.yaml	2015-07-23 12:07:56 +0000
@@ -1,7 +1,7 @@
 name: beagleblack
 vendor: Sergio Schvezov <[e-mail]>
 icon: meta/element14.png
-version: 1.8
+version: 1.11
 type: oem
 
 immutable-config:
@@ -19,6 +19,7 @@
         bootloader: u-boot
         boot-assets:
             files:
+                - path: uboot.env
                 - path: uEnv.txt
             raw-files:
                 - path: MLO
 
=== modified file 'beagleblack/u-boot.img'
 Binary 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
=== modified file 'beagleblack/uEnv.txt'
--- beagleblack/uEnv.txt	2015-06-12 10:20:31 +0000
+++ beagleblack/uEnv.txt	2015-07-23 12:07:56 +0000
@@ -1,6 +0,0 @@
-# where to load initrd
-initrd_addr=0x88080000
-# load Snappy environment and call into Snappy boot after processing this file
-uenvcmd=load mmc ${bootpart} ${loadaddr} snappy-system.txt; env import -t $loadaddr $filesize; run snappy_boot
-# boot from SD, ignoring eMMC (LP: #1464275)
-bootpart=0:1
 
=== added file 'beagleblack/uboot.env'
 Binary files beagleblack/uboot.env	1970-01-01 00:00:00 +0000 and beagleblack/uboot.env	2015-07-23 12:07:56 +0000 differ
=== added file 'beagleblack/uboot.env.in'
--- beagleblack/uboot.env.in	1970-01-01 00:00:00 +0000
+++ beagleblack/uboot.env.in	2015-07-23 12:07:56 +0000
@@ -0,0 +1,70 @@
+arch=arm
+baudrate=115200
+board=am335x
+boot_fdt=try
+bootcmd=run findfdt; run mmcboot;setenv mmcdev 1; setenv bootpart 1:2; run mmcboot;run nandboot;
+bootdelay=1
+bootdir=/boot
+bootenv=uEnv.txt
+bootfile=zImage
+bootm_size=0x10000000
+bootpart=0:1
+bootscript=echo Running bootscript from mmc${mmcdev} ...; source ${loadaddr}
+console=ttyO0,115200n8
+cpu=armv7
+dfu_alt_info_emmc=rawemmc raw 0 3751936
+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
+dfu_alt_info_ram=kernel ram 0x80200000 0xD80000;fdt ram 0x80F80000 0x80000;ramdisk ram 0x81000000 0x4000000
+fdt_addr_r=0x88000000
+fdtaddr=0x88000000
+fdtfile=am335x-boneblack.dtb
+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; 
+importbootenv=echo Importing environment from mmc ...; env import -t -r $loadaddr $filesize
+initrd_addr=0x88080000
+initrd_file=initrd.img
+kernel_addr_r=0x82000000
+kernel_file=vmlinuz
+loadaddr=0x82000000
+loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}
+loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
+loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${snappy_ab}/dtbs/${fdtfile}
+loadfiles=run loadkernel; run loadinitrd; run loadfdt
+loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
+loadinitrd=load mmc ${mmcdev}:${mmcpart} ${initrd_addr} ${snappy_ab}/${initrd_file}; setenv initrd_size ${filesize}
+loadkernel=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${snappy_ab}/${kernel_file}
+loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz
+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
+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;
+mmcdev=0
+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;
+mmcroot=/dev/mmcblk0p2 ro
+mmcrootfstype=ext4 rootwait
+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
+netboot=echo Booting from network ...; setenv autoload no; dhcp; run netloadimage; run netloadfdt; run netargs; bootz ${loadaddr} - ${fdtaddr}
+netloadfdt=tftp ${fdtaddr} ${fdtfile}
+netloadimage=tftp ${loadaddr} ${bootfile}
+nfsopts=nolock
+partitions=uuid_disk=${uuid_gpt_disk};name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}
+ramargs=setenv bootargs console=${console} ${optargs} root=${ramroot} rootfstype=${ramrootfstype}
+ramboot=echo Booting from ramdisk ...; run ramargs; bootz ${loadaddr} ${rdaddr} ${fdtaddr}
+ramdisk_addr_r=0x88080000
+ramroot=/dev/ram0 rw
+ramrootfstype=ext2
+rdaddr=0x88080000
+rootpath=/export/rootfs
+snappy_ab=a
+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}
+snappy_cmdline=init=/lib/systemd/systemd ro panic=-1 fixrtc
+snappy_mode=regular
+snappy_trial_boot=0
+soc=am33xx
+spiargs=setenv bootargs console=${console} ${optargs} root=${spiroot} rootfstype=${spirootfstype}
+spiboot=echo Booting from spi ...; run spiargs; sf probe ${spibusno}:0; sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; bootz ${loadaddr}
+spibusno=0
+spiimgsize=0x362000
+spiroot=/dev/mtdblock4 rw
+spirootfstype=jffs2
+spisrcaddr=0xe0000
+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
+uenvcmd=run snappy_boot
+vendor=ti