Eric Lee / smarc-uboot

6
Download as
Browse Code ยป

Commit 601eda60064b5c1e27daadf7b963090f0381d388

Authored by Ji Luo
1 parent 5a7973e8f4
Exists in smarc-8m-android-10.0.0_2.6.0 and in 1 other branch 8qm-imx_v2020.04_5.4.70_2.3.0

MA-17910-2 Enable CONFIG_LOAD_KEY_FROM_RPMB for some platforms 

Enable loading the avb public key from RPMB storage for some
platforms.

Test: AVB verify pass.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: Ia9c080717239611f8d1bea18dbc61c7ae9a6741e

Showing 21 changed files with 21 additions and 0 deletions Side-by-side Diff

configs/imx8mm_evk_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -157,4 +157,5 @@
157 157 CONFIG_AVB_WARNING_LOGO_COLS=0x320
158 158 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
159 159 CONFIG_VIRTUAL_AB_SUPPORT=y
  160 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mm_evk_android_trusty_dual_defconfig
Diff comments   View file @ 601eda6
... ... @@ -159,4 +159,5 @@
159 159 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 160 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 161 CONFIG_VIRTUAL_AB_SUPPORT=y
  162 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -159,4 +159,5 @@
159 159 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 160 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 161 CONFIG_VIRTUAL_AB_SUPPORT=y
  162 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mn_evk_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -157,4 +157,5 @@
157 157 CONFIG_AVB_WARNING_LOGO_COLS=0x320
158 158 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
159 159 CONFIG_VIRTUAL_AB_SUPPORT=y
  160 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mn_evk_android_trusty_dual_defconfig
Diff comments   View file @ 601eda6
... ... @@ -159,4 +159,5 @@
159 159 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 160 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 161 CONFIG_VIRTUAL_AB_SUPPORT=y
  162 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -159,4 +159,5 @@
159 159 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 160 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 161 CONFIG_VIRTUAL_AB_SUPPORT=y
  162 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mp_evk_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -169,4 +169,5 @@
169 169 CONFIG_AVB_WARNING_LOGO_COLS=0x320
170 170 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
171 171 CONFIG_VIRTUAL_AB_SUPPORT=y
  172 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mp_evk_android_trusty_dual_defconfig
Diff comments   View file @ 601eda6
... ... @@ -171,4 +171,5 @@
171 171 CONFIG_AVB_WARNING_LOGO_COLS=0x320
172 172 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
173 173 CONFIG_VIRTUAL_AB_SUPPORT=y
  174 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mp_evk_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -171,4 +171,5 @@
171 171 CONFIG_AVB_WARNING_LOGO_COLS=0x320
172 172 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
173 173 CONFIG_VIRTUAL_AB_SUPPORT=y
  174 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mq_evk_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -149,4 +149,5 @@
149 149 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
150 150 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
151 151 CONFIG_VIRTUAL_AB_SUPPORT=y
  152 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mq_evk_android_trusty_dual_defconfig
Diff comments   View file @ 601eda6
... ... @@ -151,4 +151,5 @@
151 151 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
152 152 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
153 153 CONFIG_VIRTUAL_AB_SUPPORT=y
  154 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -151,4 +151,5 @@
151 151 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
152 152 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
153 153 CONFIG_VIRTUAL_AB_SUPPORT=y
  154 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qm_mek_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -192,4 +192,5 @@
192 192 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
193 193 CONFIG_PSCI_BOARD_REBOOT=y
194 194 CONFIG_VIRTUAL_AB_SUPPORT=y
  195 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -194,4 +194,5 @@
194 194 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
195 195 CONFIG_PSCI_BOARD_REBOOT=y
196 196 CONFIG_VIRTUAL_AB_SUPPORT=y
  197 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qm_mek_androidauto_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -176,4 +176,5 @@
176 176 CONFIG_SPL_MMC_WRITE=y
177 177 CONFIG_SPL_LIBDISK_SUPPORT=y
178 178 CONFIG_PSCI_BOARD_REBOOT=y
  179 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -178,4 +178,5 @@
178 178 CONFIG_SECURE_UNLOCK=y
179 179 CONFIG_AHAB_BOOT=y
180 180 CONFIG_PSCI_BOARD_REBOOT=y
  181 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qm_mek_androidauto_xen_defconfig
Diff comments   View file @ 601eda6
... ... @@ -200,4 +200,5 @@
200 200 CONFIG_XEN=y
201 201 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
202 202 CONFIG_XEN_DEBUG_SERIAL=y
  203 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qxp_mek_android_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -193,4 +193,5 @@
193 193 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
194 194 CONFIG_PSCI_BOARD_REBOOT=y
195 195 CONFIG_VIRTUAL_AB_SUPPORT=y
  196 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -195,4 +195,5 @@
195 195 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
196 196 CONFIG_PSCI_BOARD_REBOOT=y
197 197 CONFIG_VIRTUAL_AB_SUPPORT=y
  198 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qxp_mek_androidauto_trusty_defconfig
Diff comments   View file @ 601eda6
... ... @@ -187,4 +187,5 @@
187 187 CONFIG_SPL_MMC_WRITE=y
188 188 CONFIG_SPL_LIBDISK_SUPPORT=y
189 189 CONFIG_PSCI_BOARD_REBOOT=y
  190 +CONFIG_LOAD_KEY_FROM_RPMB=y
configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
Diff comments   View file @ 601eda6
... ... @@ -189,4 +189,5 @@
189 189 CONFIG_SECURE_UNLOCK=y
190 190 CONFIG_AHAB_BOOT=y
191 191 CONFIG_PSCI_BOARD_REBOOT=y
  192 +CONFIG_LOAD_KEY_FROM_RPMB=y