diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 21:09:31 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 22:07:58 +0200 |
| commit | 44cbe10f592965d7611d8624f94f2952d42eba35 (patch) | |
| tree | 4da983e52c73cc30653c18946fe6afdd014cb0f7 /src/include/cpu/x86 | |
| parent | beb45020ace2b2d3f6cf4b88f9e7218c33a6225b (diff) | |
| download | coreboot-44cbe10f592965d7611d8624f94f2952d42eba35.tar.xz | |
smm: Merge configs SMM_MODULES and SMM_TSEG
SMM_TSEG now implies SMM_MODULES and SMM_MODULES can't be used without SMM_TSEG
Remove some newly dead code while on it.
Change-Id: I2e1818245170b1e0abbd853bedf856cec83b92f2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/10355
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/include/cpu/x86')
| -rw-r--r-- | src/include/cpu/x86/smm.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 56e9a651d1..b717811a74 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -472,7 +472,7 @@ int mainboard_io_trap_handler(int smif); void southbridge_smi_set_eos(void); -#if CONFIG_SMM_MODULES +#if CONFIG_SMM_TSEG void cpu_smi_handler(void); void northbridge_smi_handler(void); void southbridge_smi_handler(void); @@ -480,24 +480,21 @@ void southbridge_smi_handler(void); void cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); void northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); -#endif /* CONFIG_SMM_MODULES */ +#endif /* CONFIG_SMM_TSEG */ void mainboard_smi_gpi(u32 gpi_sts); int mainboard_smi_apmc(u8 data); void mainboard_smi_sleep(u8 slp_typ); #if !CONFIG_SMM_TSEG void smi_release_lock(void); -#elif CONFIG_SMM_MODULES -#define smi_get_tseg_base() 0 #else -/* Return address of TSEG base */ -u32 smi_get_tseg_base(void); +#define smi_get_tseg_base() 0 #endif /* Get PMBASE address */ u16 smm_get_pmbase(void); -#if CONFIG_SMM_MODULES +#if CONFIG_SMM_TSEG struct smm_runtime { u32 smbase; @@ -569,7 +566,7 @@ struct smm_loader_params { int smm_setup_relocation_handler(struct smm_loader_params *params); int smm_load_module(void *smram, int size, struct smm_loader_params *params); #endif /* __SMM__ */ -#endif /* CONFIG_SMM_MODULES */ +#endif /* CONFIG_SMM_TSEG */ /* Backup and restore default SMM region. */ void *backup_default_smm_area(void); |