Skip to contentSkip to conversation

board: ti: Move fastboot functions out of TI_SECURE_DEVICE ifdef

PATCH In review Andrew F. Davis 3 participants 3 messages Feb 11, 2019 – Mar 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 board: ti: Move fastboot functions out of TI_SECURE_DEVICE ifdef

When these were moved from mach-omap2 to board files they got placed inside TI_SECURE_DEVICE ifdef block, they are not secure only, move them up and out.

Fixes 413b90777f8d ("ti: fastboot: Move weak overrides to board files")
---
 board/ti/am57xx/board.c | 20 ++++++++++----------
 board/ti/dra7xx/evm.c   | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)
board/ti/am57xx/board.c +10 -10
index 7063345dcc..1a903f13a6 100644
@@ -1096,6 +1096,16 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
+int fastboot_set_reboot_flag(void)
+{
+	printf("Setting reboot to fastboot flag ...\n");
+	env_set("dofastboot", "1");
+	env_save();
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_TI_SECURE_DEVICE
 void board_fit_image_post_process(void **p_image, size_t *p_size)
 {
@@ -1107,15 +1117,5 @@ void board_tee_image_process(ulong tee_image, size_t tee_size)
 	secure_tee_install((u32)tee_image);
 }
 
-#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
-int fastboot_set_reboot_flag(void)
-{
-	printf("Setting reboot to fastboot flag ...\n");
-	env_set("dofastboot", "1");
-	env_save();
-	return 0;
-}
-#endif
-
 U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process);
 #endif
board/ti/dra7xx/evm.c +10 -10
index d69641e3a0..060c471032 100644
@@ -1092,6 +1092,16 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
+int fastboot_set_reboot_flag(void)
+{
+	printf("Setting reboot to fastboot flag ...\n");
+	env_set("dofastboot", "1");
+	env_save();
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_TI_SECURE_DEVICE
 void board_fit_image_post_process(void **p_image, size_t *p_size)
 {
@@ -1103,15 +1113,5 @@ void board_tee_image_process(ulong tee_image, size_t tee_size)
 	secure_tee_install((u32)tee_image);
 }
 
-#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
-int fastboot_set_reboot_flag(void)
-{
-	printf("Setting reboot to fastboot flag ...\n");
-	env_set("dofastboot", "1");
-	env_save();
-	return 0;
-}
-#endif
-
 U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process);
 #endif
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 board: ti: Move fastboot functions out of TI_SECURE_DEVICE ifdef

Quoted 6 lines · Andrew F. Davis

When these were moved from mach-omap2 to board files they got placed inside TI_SECURE_DEVICE ifdef block, they are not secure only, move them up and out.

Fixes 413b90777f8d ("ti: fastboot: Move weak overrides to board files")

Thanks and regards,
Lokesh

#2 lore raw
In reply to Andrew F. Davis
Quoted 7 lines · Andrew F. Davis

When these were moved from mach-omap2 to board files they got placed inside TI_SECURE_DEVICE ifdef block, they are not secure only, move them up and out.

Fixes 413b90777f8d ("ti: fastboot: Move weak overrides to board files")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190322/84717146/attachment.sig>