From 7596c54dba82793fa53d05925ded98ffb4d3c7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Fri, 13 Sep 2019 10:51:04 +0300
Subject: lib/trace: Replace __PRE_RAM__ use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I957be92594aced2e8465e7f94d8d42e44c3418d7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35399
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/include/trace.h | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/include/trace.h b/src/include/trace.h
index 4f5b8c4e04..aed69a8963 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 @@ extern volatile int trace_dis;
 #define DISABLE_TRACE_ON_FUNCTION
 
 #endif
-#endif
+
 #endif
-- 
cgit v1.2.3