Merge branch 'next-dev' into thunder-boot

This commit is contained in:
Joseph Chen 2020-04-20 20:18:44 +08:00
commit e0058109d4
2 changed files with 9461 additions and 9420 deletions

File diff suppressed because it is too large Load Diff

View File

@ -712,8 +712,8 @@ function pack_fit_image()
if grep -q '^CONFIG_FIT_SIGNATURE=y' .config ; then if grep -q '^CONFIG_FIT_SIGNATURE=y' .config ; then
./scripts/fit-vboot.sh $* ./scripts/fit-vboot.sh $*
else else
./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild
rm uboot.img trust*.img -rf rm uboot.img trust*.img -rf
./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild
echo "pack uboot.img (with uboot trust) okay! Input: $ini" echo "pack uboot.img (with uboot trust) okay! Input: $ini"
fi fi
} }