diff options
| author | Ji Luo <ji.luo@nxp.com> | 2018-11-30 09:59:36 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2018-12-04 09:53:12 +0800 |
| commit | d7c768a690529017a476552091ffd4bc9a6159c7 (patch) | |
| tree | 874720aaf290bd19f39990cde8b00c3ece746c2b /common | |
| parent | 69142ab1d90b1eef1d8d6a0137b24a9f75c14b83 (diff) | |
MA-13628 [Auto] Read/Write rollback index from rpmb
Secure storage is ready in trusty so we should read/write the rollback
index from rpmb.
But for borads without rpmb key, read/write the rpmb will fail and will
block the following avb verify process. In this case, check if the rpmb
key has been set and always return AVB_IO_RESULT_OK for the boards without
rpmb key.
Test: build and boot pass on imx8qm_mek.
Change-Id: I10c438e56d049ae97ebedfc446c8202642630d8b
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index f9cd2e26a0..9444bc17b8 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -654,7 +654,7 @@ static int initr_kbd(void) } #endif -#ifdef AVB_RPMB +#if defined(AVB_RPMB) && !defined(CONFIG_SPL) extern int init_avbkey(void); static int initr_avbkey(void) { @@ -899,7 +899,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_PS2KBD initr_kbd, #endif -#ifdef AVB_RPMB +#if defined(AVB_RPMB) && !defined(CONFIG_SPL) initr_avbkey, #endif #ifdef CONFIG_IMX_TRUSTY_OS |