[U-Boot] board: ti: Move fastboot functions out of TI_SECURE_DEVICE ifdef

Message ID 20190211140008.21623-1-afd@ti.com
State Accepted
Commit 50580a0e7053599abdaa467cb43cff0c66564369
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] board: ti: Move fastboot functions out of TI_SECURE_DEVICE ifdef
Related show

Commit Message

Andrew F. Davis Feb. 11, 2019, 2 p.m.
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")
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 board/ti/am57xx/board.c | 20 ++++++++++----------
 board/ti/dra7xx/evm.c   | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

Comments

Lokesh Vutla Feb. 12, 2019, 3:43 a.m. | #1
On 11/02/19 7:30 PM, Andrew F. Davis wrote:
> 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")
> Signed-off-by: Andrew F. Davis <afd@ti.com>


Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh
Tom Rini March 22, 2019, 11:16 p.m. | #2
On Mon, Feb 11, 2019 at 08:00:08AM -0600, Andrew F. Davis wrote:

> 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")
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Applied to u-boot/master, thanks!

Patch

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 7063345dcc..1a903f13a6 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -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
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index d69641e3a0..060c471032 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -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