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>
This commit is contained in:
committed by
Julius Werner
parent
a62191b827
commit
8c8e2b7e4c
@ -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);
|
||||
|
@ -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); }
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user