summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-10-14 10:08:10 -0500
committerJulius Werner <jwerner@chromium.org>2015-11-07 03:28:06 +0100
commit8c8e2b7e4c5f1e6a543ce67cf8b47e9feb1bac50 (patch)
tree6ba073716a547d07ce4f762a31f340b36870ef8b /src/include
parenta62191b827411e0e42ac64cf42a861f649b874f9 (diff)
downloadcoreboot-8c8e2b7e4c5f1e6a543ce67cf8b47e9feb1bac50.tar.xz
arm64: remove secmon
It's been decided to only support ARM Trusted Firmware for any EL3 monitor. That means any SoC that requires PSCI needs to add its support for ATF otherwise multi-processor bring up won't work. Change-Id: Ic931dbf5eff8765f4964374910123a197148f0ff Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11897 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/console/console.h4
-rw-r--r--src/include/console/uart.h2
-rw-r--r--src/include/rules.h16
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