Merge branch 'next-dev' into thunder-boot

This commit is contained in:
Joseph Chen 2020-04-10 16:38:43 +08:00
commit 9d4243d397
4 changed files with 8 additions and 3 deletions

View File

@ -209,6 +209,7 @@ config FIT_SIGNATURE
bool "Enable signature verification of FIT uImages"
depends on DM
select RSA
select CONSOLE_DISABLE_CLI
help
This option enables signature verification of FIT uImages,
using a hash signed and verified using RSA. If

View File

@ -252,8 +252,7 @@ config CONSOLE_RECORD_IN_SIZE
config CONSOLE_DISABLE_CLI
bool "disable ctrlc"
depends on BOOTDELAY = 0
default y if AVB_VBMETA_PUBLIC_KEY_VALIDATE || FIT_SIGNATURE
default n
help
This disable CLI interactive in verified-boot.

View File

@ -9,6 +9,7 @@ config AVB_LIBAVB_USER
config AVB_VBMETA_PUBLIC_KEY_VALIDATE
bool "Support vbmeta public key validate"
depends on AVB_LIBAVB_USER
select CONSOLE_DISABLE_CLI
help
support vbmeta public key validate, system bootflow would be
uninterruptale when it is enabled:

View File

@ -275,7 +275,11 @@ sub_commands()
;;
fit)
./scripts/fit-vboot.sh $*
if [ "$opt" = "s" ]; then
./scripts/fit-vboot.sh
else
./scripts/fit-vboot.sh --no-vboot
fi
exit 0
;;