diff options
| author | Elyes Haouas <ehaouas@noos.fr> | 2023-08-21 20:39:25 +0200 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2023-08-21 23:45:43 +0000 |
| commit | 757509113b6b944167cf1f13f9569236cd7e5b18 (patch) | |
| tree | a704133034ae50f622c9381454513145ef86d02b /src/soc/intel/cannonlake | |
| parent | a1957314c2cb78a229ca87bd2523d24001a644a9 (diff) | |
soc: Remove SOC_SPECIFIC_OPTIONS
Move specific options under the boolean and remove dummy
SOC_SPECIFIC_OPTIONS.
Change-Id: I6ae52ceb61489e5a050a60d1fbbf4250960407eb
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76487
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'src/soc/intel/cannonlake')
| -rw-r--r-- | src/soc/intel/cannonlake/Kconfig | 107 |
1 files changed, 52 insertions, 55 deletions
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 9e6ca2a457..b58dfd3526 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -1,60 +1,5 @@ config SOC_INTEL_CANNONLAKE_BASE bool - -config SOC_INTEL_COFFEELAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_EXP_X86_64_SUPPORT - select HAVE_INTEL_FSP_REPO - select HECI_DISABLE_USING_SMM - select INTEL_CAR_NEM - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - -config SOC_INTEL_WHISKEYLAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_INTEL_FSP_REPO - select HECI_DISABLE_USING_SMM - select INTEL_CAR_NEM_ENHANCED - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - -config SOC_INTEL_COMETLAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_INTEL_FSP_REPO - select INTEL_CAR_NEM_ENHANCED - select PMC_IPC_ACPI_INTERFACE if DISABLE_HECI1_AT_PRE_BOOT - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC - select SOC_INTEL_COMMON_BASECODE - select SOC_INTEL_COMMON_BASECODE_RAMTOP - -config SOC_INTEL_COMETLAKE_1 - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_2 - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_S - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_V - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_CANNONLAKE_PCH_H - bool - -if SOC_INTEL_CANNONLAKE_BASE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_NHLT select ARCH_X86 @@ -124,6 +69,58 @@ config CPU_SPECIFIC_OPTIONS select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE select X86_CLFLUSH_CAR +config SOC_INTEL_COFFEELAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_EXP_X86_64_SUPPORT + select HAVE_INTEL_FSP_REPO + select HECI_DISABLE_USING_SMM + select INTEL_CAR_NEM + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + +config SOC_INTEL_WHISKEYLAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_INTEL_FSP_REPO + select HECI_DISABLE_USING_SMM + select INTEL_CAR_NEM_ENHANCED + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + +config SOC_INTEL_COMETLAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_INTEL_FSP_REPO + select INTEL_CAR_NEM_ENHANCED + select PMC_IPC_ACPI_INTERFACE if DISABLE_HECI1_AT_PRE_BOOT + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC + select SOC_INTEL_COMMON_BASECODE + select SOC_INTEL_COMMON_BASECODE_RAMTOP + +config SOC_INTEL_COMETLAKE_1 + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_2 + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_S + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_V + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_CANNONLAKE_PCH_H + bool + +if SOC_INTEL_CANNONLAKE_BASE + config MAX_CPUS int default 20 if SOC_INTEL_CANNONLAKE_PCH_H && SOC_INTEL_COMETLAKE |