3 files changed, 3 insertions, 19 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h
index c304206910..770489967f 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -47,8 +47,8 @@ void __attribute__ ((noreturn)) die(const char *msg);
 
 #define __CONSOLE_ENABLE__ \
 	((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \
-	ENV_SECMON || ENV_VERSTAGE || \
-	ENV_ROMSTAGE || ENV_RAMSTAGE || (ENV_SMM && CONFIG_DEBUG_SMI))
+	ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || \
+	(ENV_SMM && CONFIG_DEBUG_SMI))
 
 #if __CONSOLE_ENABLE__
 void console_init(void);
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index 7da0e87ea9..8458086d49 100644
--- a/src/include/console/uart.h
+++ b/src/include/console/uart.h
@@ -53,7 +53,7 @@ void oxford_remap(unsigned int new_base);
 
 #define __CONSOLE_SERIAL_ENABLE__	CONFIG_CONSOLE_SERIAL && \
 	(ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \
-	ENV_SECMON || (ENV_SMM && CONFIG_DEBUG_SMI))
+	(ENV_SMM && CONFIG_DEBUG_SMI))
 
 #if __CONSOLE_SERIAL_ENABLE__
 static inline void __uart_init(void)		{ uart_init(CONFIG_UART_FOR_CONSOLE); }
diff --git a/src/include/rules.h b/src/include/rules.h
index a18f2f389d..315a65e5d1 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -24,7 +24,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 0
 
@@ -33,7 +32,6 @@
 #define ENV_ROMSTAGE 1
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 0
 
@@ -42,16 +40,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 1
-#define ENV_SECMON 0
-#define ENV_VERSTAGE 0
-#define ENV_RMODULE 0
-
-#elif defined(__SECMON__)
-#define ENV_BOOTBLOCK 0
-#define ENV_ROMSTAGE 0
-#define ENV_RAMSTAGE 0
-#define ENV_SMM 0
-#define ENV_SECMON 1
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 0
 
@@ -60,7 +48,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 1
 #define ENV_RMODULE 0
 
@@ -69,7 +56,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 1
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 0
 
@@ -78,7 +64,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 1
 
@@ -93,7 +78,6 @@
 #define ENV_ROMSTAGE 0
 #define ENV_RAMSTAGE 0
 #define ENV_SMM 0
-#define ENV_SECMON 0
 #define ENV_VERSTAGE 0
 #define ENV_RMODULE 0
 #endif