diff options
| author | ji.luo <ji.luo@nxp.com> | 2017-08-22 20:09:46 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2017-11-03 02:37:20 +0800 |
| commit | 84f9b3ea69e816dcd4edafcbc4aad4d0237dec55 (patch) | |
| tree | 51517af5fdb47f6e73c9b45c214a452e1b1eb5fa /common | |
| parent | d4801535628ac52589fff9340bd3e420ef04dc30 (diff) | |
MA-10336-1 Take new AVB method
Use hard code public key instead of reading it from RPMB.
Read RPMB key from last block of BOOT1 instead of fuse.
Change-Id: Icddd0bc45af8f9a9b222d54e16a7dfc6efa6c8b2
Signed-off-by: ji.luo <ji.luo@nxp.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8001f3669c..5980a8ccf8 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -736,14 +736,14 @@ static int initr_check_fastboot(void) } #endif -#ifdef CONFIG_IMX_TRUSTY_OS -#ifdef TRUSTY_KEYSLOT_PACKAGE +#ifdef AVB_RPMB static int initr_avbkey(void) { return init_avbkey(); } #endif +#ifdef CONFIG_IMX_TRUSTY_OS static int initr_tee_setup(void) { tee_setup(); @@ -980,10 +980,10 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_SPARC) prom_init, #endif -#ifdef CONFIG_IMX_TRUSTY_OS -#ifdef TRUSTY_KEYSLOT_PACKAGE +#ifdef AVB_RPMB initr_avbkey, #endif +#ifdef CONFIG_IMX_TRUSTY_OS initr_tee_setup, #endif #ifdef CONFIG_FSL_FASTBOOT |