GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE 

This allows to use Kconfig options to differentiate between SOC
variants.

Change-Id: Ica11c68377e3d0dc8a8f48198e01a74d7bebe642
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33559
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-06-17 13:32:13 +02:00 committed by Philipp Deppenwiese
parent b4a1981289
commit c8db633852
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/soc/intel/cannonlake/Kconfig
View File

@ -1,12 +1,9 @@
config SOC_INTEL_CANNONLAKE config SOC_INTEL_CANNONLAKE_BASE
bool bool
help
Intel Cannonlake support
config SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS config SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS
bool bool
default n default y if SOC_INTEL_CANNONLAKE_BASE && !SOC_INTEL_CANNONLAKE
select SOC_INTEL_CANNONLAKE
help help
Single Kconfig option to select common base Cannonlake support. Single Kconfig option to select common base Cannonlake support.
This Kconfig will help to select majority of CNL SoC features. This Kconfig will help to select majority of CNL SoC features.
@ -16,34 +13,36 @@ config SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS
required SoC support FSP headers. Any future Intel SoC would required SoC support FSP headers. Any future Intel SoC would
like to make use of CNL support might just select this Kconfig. like to make use of CNL support might just select this Kconfig.
config SOC_INTEL_CANNONLAKE
bool
select SOC_INTEL_CANNONLAKE_BASE
help
Intel Cannonlake support
config SOC_INTEL_COFFEELAKE config SOC_INTEL_COFFEELAKE
bool bool
default n select SOC_INTEL_CANNONLAKE_BASE
select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS
help help
Intel Coffeelake support Intel Coffeelake support
config SOC_INTEL_WHISKEYLAKE config SOC_INTEL_WHISKEYLAKE
bool bool
default n select SOC_INTEL_CANNONLAKE_BASE
select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS
help help
Intel Whiskeylake support Intel Whiskeylake support
config SOC_INTEL_COMETLAKE config SOC_INTEL_COMETLAKE
bool bool
default n select SOC_INTEL_CANNONLAKE_BASE
select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS
help help
Intel Cometlake support Intel Cometlake support
config SOC_INTEL_CANNONLAKE_PCH_H config SOC_INTEL_CANNONLAKE_PCH_H
bool bool
default n
help help
Choose this option if you have a PCH-H chipset. Choose this option if you have a PCH-H chipset.
if SOC_INTEL_CANNONLAKE if SOC_INTEL_CANNONLAKE_BASE
config CPU_SPECIFIC_OPTIONS config CPU_SPECIFIC_OPTIONS
def_bool y def_bool y
@ -297,7 +296,7 @@ config FSP_HEADER_PATH
string "Location of FSP headers" string "Location of FSP headers"
default "3rdparty/fsp/CoffeeLakeFspBinPkg/Include/" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE default "3rdparty/fsp/CoffeeLakeFspBinPkg/Include/" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE
default "src/vendorcode/intel/fsp/fsp2_0/cometlake/" if SOC_INTEL_COMETLAKE default "src/vendorcode/intel/fsp/fsp2_0/cometlake/" if SOC_INTEL_COMETLAKE
default "src/vendorcode/intel/fsp/fsp2_0/cannonlake/" default "src/vendorcode/intel/fsp/fsp2_0/cannonlake/" if SOC_INTEL_CANNONLAKE
config FSP_FD_PATH config FSP_FD_PATH
string string

2
src/soc/intel/cannonlake/Makefile.inc
View File

@ -1,4 +1,4 @@
ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE),y) ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE_BASE),y)
subdirs-y += romstage subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode subdirs-y += ../../../cpu/intel/microcode