qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next-dev' into thunder-boot

This commit is contained in:
Joseph Chen 2020-04-10 16:38:43 +08:00
parent f8f8bbc62f e7be2a072c
commit 9d4243d397
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kconfig
View File

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

3
common/Kconfig
View File

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

1
lib/avb/libavb_user/Kconfig
View File

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

6
make.sh
View File

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