[PATCH] fixup! security: optee: add helpers to register OF overlays

[Ahmad Fatoum]

security: optee: fixup: emit stubs if CONFIG_OF_FIXUP_OPTEE disabled

sandbox allyesconfig build fails, because it has CONFIG_HAVE_OPTEE=y,
but no CONFIG_OF_FIXUP_OPTEE.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 include/tee/optee.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/tee/optee.h b/include/tee/optee.h
index 535811278d21..c25a9922e3d8 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -38,8 +38,6 @@ int optee_verify_header (const struct optee_header *hdr);
 void optee_set_membase(const struct optee_header *hdr);
 int optee_get_membase(u64 *membase);
 void optee_handoff_overlay(void *ovl, unsigned int ovl_sz);
-void optee_register_overlay(void);
-bool optee_overlay_registered(void);
 
 #else
 
@@ -56,6 +54,12 @@ static inline void optee_handoff_overlay(void *ovl, unsigned int ovl_sz)
 {
 }
 
+#endif /* CONFIG_HAVE_OPTEE */
+
+#ifdef CONFIG_OF_FIXUP_OPTEE
+void optee_register_overlay(void);
+bool optee_overlay_registered(void);
+#else
 static inline void optee_register_overlay(void)
 {
 }
@@ -64,8 +68,7 @@ static inline bool optee_overlay_registered(void)
 {
 	return false;
 }
-
-#endif /* CONFIG_HAVE_OPTEE */
+#endif /* CONFIG_OF_FIXUP_OPTEE */
 
 #ifdef __PBL__
 
-- 
2.47.3