cpu/x86: remove BACKUP_DEFAULT_SMM_REGION option
Unconditionally provide the backup default SMM area API. There's no reason to guard the symbols behind anything since linker garbage collection is implemented. A board or chipset is free to use the code or not without needing to select an option. Change-Id: I14cf1318136a17f48ba5ae119507918190e25387 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/14561 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
		
				
					committed by
					
						 Martin Roth
						Martin Roth
					
				
			
			
				
	
			
			
			
						parent
						
							aa431c0e17
						
					
				
				
					commit
					d87c7bc07c
				
			| @@ -10,7 +10,6 @@ config CPU_SPECIFIC_OPTIONS | ||||
| 	select ARCH_VERSTAGE_X86_32 | ||||
| 	select ARCH_ROMSTAGE_X86_32 | ||||
| 	select ARCH_RAMSTAGE_X86_32 | ||||
| 	select BACKUP_DEFAULT_SMM_REGION | ||||
| 	select HAVE_MONOTONIC_TIMER | ||||
| 	select SMP | ||||
| 	select MMX | ||||
|   | ||||
| @@ -127,12 +127,6 @@ config PLATFORM_USES_FSP1_0 | ||||
| 	  Selected for Intel processors/platform combinations that use the | ||||
| 	  Intel Firmware Support Package (FSP) 1.0 for initialization. | ||||
|  | ||||
| config BACKUP_DEFAULT_SMM_REGION | ||||
| 	def_bool n | ||||
| 	help | ||||
| 	 The CPU support will select this option if the default SMM region | ||||
| 	 needs to be backed up for suspend/resume purposes. | ||||
|  | ||||
| config MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING | ||||
| 	def_bool n | ||||
| 	help | ||||
|   | ||||
| @@ -5,6 +5,7 @@ endif | ||||
| subdirs-$(CONFIG_PARALLEL_MP) += name | ||||
| ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c | ||||
| ramstage-$(CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING) += mirror_payload.c | ||||
| ramstage-y += backup_default_smm.c | ||||
|  | ||||
| additional-dirs += $(obj)/cpu/x86 | ||||
|  | ||||
|   | ||||
| @@ -13,7 +13,6 @@ | ||||
| ## GNU General Public License for more details. | ||||
| ## | ||||
|  | ||||
| ramstage-$(CONFIG_BACKUP_DEFAULT_SMM_REGION) += backup_default_smm.c | ||||
| ramstage-y += smm_module_loader.c | ||||
|  | ||||
| ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) | ||||
|   | ||||
| @@ -11,7 +11,6 @@ config CPU_SPECIFIC_OPTIONS | ||||
| 	select ARCH_VERSTAGE_X86_32 | ||||
| 	select ARCH_ROMSTAGE_X86_32 | ||||
| 	select ARCH_RAMSTAGE_X86_32 | ||||
| 	select BACKUP_DEFAULT_SMM_REGION | ||||
| 	select CACHE_MRC_SETTINGS | ||||
| 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED | ||||
| 	select SUPPORT_CPU_UCODE_IN_CBFS | ||||
|   | ||||
| @@ -11,7 +11,6 @@ config CPU_SPECIFIC_OPTIONS | ||||
| 	select ARCH_RAMSTAGE_X86_32 | ||||
| 	select ARCH_ROMSTAGE_X86_32 | ||||
| 	select ARCH_VERSTAGE_X86_32 | ||||
| 	select BACKUP_DEFAULT_SMM_REGION | ||||
| 	select CACHE_MRC_SETTINGS | ||||
| 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE | ||||
| 	select COLLECT_TIMESTAMPS | ||||
|   | ||||
| @@ -11,7 +11,6 @@ config CPU_SPECIFIC_OPTIONS | ||||
| 	select ARCH_VERSTAGE_X86_32 | ||||
| 	select ARCH_ROMSTAGE_X86_32 | ||||
| 	select ARCH_RAMSTAGE_X86_32 | ||||
| 	select BACKUP_DEFAULT_SMM_REGION | ||||
| 	select CACHE_MRC_SETTINGS | ||||
| 	select MRC_SETTINGS_PROTECT | ||||
| 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE | ||||
|   | ||||
| @@ -12,7 +12,6 @@ config CPU_SPECIFIC_OPTIONS | ||||
| 	select ARCH_ROMSTAGE_X86_32 | ||||
| 	select ARCH_VERSTAGE_X86_32 | ||||
| 	select ACPI_NHLT | ||||
| 	select BACKUP_DEFAULT_SMM_REGION | ||||
| 	select CACHE_MRC_SETTINGS | ||||
| 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE | ||||
| 	select COLLECT_TIMESTAMPS | ||||
|   | ||||
		Reference in New Issue
	
	Block a user