diff options
| author | Tristan Muntsinger <muntsinger@google.com> | 2019-11-04 18:42:09 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-04 18:42:09 -0800 |
| commit | d39c98b3e53859d942b5a3f735794fcfd8f4d15c (patch) | |
| tree | eeff1f9adaa90e2c11cc2aa380eeb2388e5db682 | |
| parent | b7ec60efa0c36c9cc8516425a609348c80ddb90d (diff) | |
| parent | 42a3965b557c9e3366c5dcb1cf8914a3b28db36f (diff) | |
| download | cuttlefish_common-d39c98b3e53859d942b5a3f735794fcfd8f4d15c.tar.gz | |
Merge changes from topic "u-boot v2019.10"
am: 42a3965b55
Change-Id: I78596d2855b65a235115a065363a665a07a0e1df
| -rwxr-xr-x | tools/create_base_image_arm.sh | 7 | ||||
| -rwxr-xr-x | tools/flash-blk-dev.sh | 13 |
2 files changed, 3 insertions, 17 deletions
diff --git a/tools/create_base_image_arm.sh b/tools/create_base_image_arm.sh index e6d0b856..4cd673b4 100755 --- a/tools/create_base_image_arm.sh +++ b/tools/create_base_image_arm.sh @@ -129,7 +129,6 @@ if [ ${FLAGS_p2} -eq ${FLAGS_TRUE} ]; then tmpfile=`mktemp` bootenv=`mktemp` cat > ${tmpfile} << "EOF" -ethaddr=00:00:00:00:00:00 bootdelay=2 baudrate=1500000 scriptaddr=0x00500000 @@ -139,9 +138,9 @@ distro_bootcmd=for target in ${boot_targets}; do run bootcmd_${target}; done bootcmd_mmc0=devnum=0; run mmc_boot bootcmd_mmc1=devnum=1; run mmc_boot mmc_boot=if mmc dev ${devnum}; then ; run scan_for_boot_part; fi -scan_for_boot_part=part list mmc ${devnum} -bootable devplist; env exists devplist || setenv devplist 1; if test $devnum = 1; then script_type=init; else script_type=boot; fi; for part in ${devplist}; do if fstype mmc ${devnum}:${part} bootfstype; then run find_script; fi; done; setenv devplist; setenv script_type; -find_script=if test -e mmc ${devnum}:${part} /boot/$script_type.scr; then echo Found U-Boot script /boot/$script_type.scr; run run_scr; fi -run_scr=load mmc ${devnum}:${part} ${scriptaddr} /boot/$script_type.scr; source ${scriptaddr} +scan_for_boot_part=part list mmc ${devnum} -bootable devplist; env exists devplist || setenv devplist 1; if test $devnum = 1; then script_type=init; else script_type=boot; fi; for distro_bootpart in ${devplist}; do if fstype mmc ${devnum}:${distro_bootpart} bootfstype; then run find_script; fi; done; setenv devplist; setenv script_type; +find_script=if test -e mmc ${devnum}:${distro_bootpart} /boot/$script_type.scr; then echo Found U-Boot script /boot/$script_type.scr; run run_scr; fi +run_scr=load mmc ${devnum}:${distro_bootpart} ${scriptaddr} /boot/$script_type.scr; source ${scriptaddr} EOF ${ANDROID_HOST_OUT}/bin/mkenvimage -s 32768 -o ${bootenv} - < ${tmpfile} fi diff --git a/tools/flash-blk-dev.sh b/tools/flash-blk-dev.sh index d4568c25..e5381e04 100755 --- a/tools/flash-blk-dev.sh +++ b/tools/flash-blk-dev.sh @@ -101,19 +101,6 @@ main() elif [ "$part_type" == "GPT" ]; then parts=`sudo gdisk -l /dev/${blk_dev} | grep "^Number" -A999 | tail -n +2 | wc -l` FIRST_SECTOR=`sudo gdisk -l /dev/${blk_dev} 2>/dev/null | tail -1 | tr -s ' ' | cut -d" " -f3` - - if [ ${parts} -ge 2 ]; then - hexchars="0123456789abcdef" - valid2ndchar="26ae" - mac=`echo -n ${hexchars:$(( $RANDOM % 16 )):1}` - mac+=`echo -n ${valid2ndchar:$(( $RANDOM % 4 )):1}` - mac+=`for i in {1..10}; do echo -n ${hexchars:$(( $RANDOM % 16 )):1}; done | sed -e 's/\(..\)/:\1/g'` - - envfile=`mktemp` - dd if=/dev/${blk_dev}2 of=${envfile} - sed -i "s/00:00:00:00:00:00/${mac}/" ${envfile} - fi - sudo sgdisk -d${parts} /dev/${blk_dev} >/dev/null 2>&1 sudo sgdisk -a1 -n:${parts}:${FIRST_SECTOR}:- -A:${parts}:set:2 -t:${parts}:8305 -c:${parts}:rootfs /dev/${blk_dev} >/dev/null 2>&1 sudo e2fsck -fy /dev/${blk_dev}${parts} >/dev/null 2>&1 |