[coreboot-gerrit] Change in coreboot[master]: lib/trace: Replace __PRE_RAM__ use

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35399 )

Change subject: lib/trace: Replace __PRE_RAM__ use
......................................................................

lib/trace: Replace __PRE_RAM__ use

Change-Id: I957be92594aced2e8465e7f94d8d42e44c3418d7
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35399
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/include/trace.h
1 file changed, 2 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved

diff --git a/src/include/trace.h b/src/include/trace.h
index 4f5b8c4..aed69a8 100644
--- a/src/include/trace.h
+++ b/src/include/trace.h
@@ -16,16 +16,7 @@
 #ifndef __TRACE_H
 #define __TRACE_H

-
-#ifdef __PRE_RAM__
-
-#define DISABLE_TRACE
-#define ENABLE_TRACE
-#define DISABLE_TRACE_ON_FUNCTION
-
-#else /* !__PRE_RAM__ */
-
-#if CONFIG(TRACE) && !defined(__SMM__)
+#if !ENV_ROMSTAGE_OR_BEFORE && CONFIG(TRACE)

void __cyg_profile_func_enter(void *, void *)
    			 __attribute__((no_instrument_function));
@@ -46,5 +37,5 @@
 #define DISABLE_TRACE_ON_FUNCTION

#endif
-#endif
+
 #endif