Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 639d7ab25ccb967072f3f81eba962cb8ce43fa95

Authored by Ye Li
1 parent 1b59659e22
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-18505 imx8qxp: Fix sec_boot environment issue 

The sec_boot environment is used for AHAB secure boot. When run command
"env default -f -a", this environment is not set due to its default value
is not added to CONFIG_EXTRA_ENV_SETTINGS. Then the boot flow will go to
AHAB branch to load OS container.

Fix the issue by adding default sec_boot value to CONFIG_EXTRA_ENV_SETTINGS.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 20fd426d8d1a8aa42343115f853e4d91087b7a5e)

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

include/configs/imx8qxp_arm2.h
Diff comments   View file @ 639d7ab
... ... @@ -89,6 +89,12 @@
89 89 #define CONFIG_MAX7322_I2C_BUS 0 /* I2C1 */
90 90 #endif
91 91  
  92 +#ifdef CONFIG_AHAB_BOOT
  93 +#define AHAB_ENV "sec_boot=yes\0"
  94 +#else
  95 +#define AHAB_ENV "sec_boot=no\0"
  96 +#endif
  97 +
92 98 /* Boot M4 */
93 99 #define M4_BOOT_ENV \
94 100 "m4_0_image=m4_0.bin\0" \
... ... @@ -127,6 +133,7 @@
127 133 #define CONFIG_EXTRA_ENV_SETTINGS \
128 134 CONFIG_MFG_ENV_SETTINGS \
129 135 M4_BOOT_ENV \
  136 + AHAB_ENV \
130 137 "script=boot.scr\0" \
131 138 "image=Image\0" \
132 139 "panel=NULL\0" \
include/configs/imx8qxp_mek.h
Diff comments   View file @ 639d7ab
... ... @@ -84,6 +84,12 @@
84 84 #define CONFIG_LIB_RAND
85 85 #define CONFIG_NET_RANDOM_ETHADDR
86 86  
  87 +#ifdef CONFIG_AHAB_BOOT
  88 +#define AHAB_ENV "sec_boot=yes\0"
  89 +#else
  90 +#define AHAB_ENV "sec_boot=no\0"
  91 +#endif
  92 +
87 93 /* Boot M4 */
88 94 #define M4_BOOT_ENV \
89 95 "m4_0_image=m4_0.bin\0" \
... ... @@ -145,6 +151,7 @@
145 151 CONFIG_MFG_ENV_SETTINGS \
146 152 M4_BOOT_ENV \
147 153 XEN_BOOT_ENV \
  154 + AHAB_ENV \
148 155 "script=boot.scr\0" \
149 156 "image=Image\0" \
150 157 "panel=NULL\0" \