Change in ...coreboot[master]: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTE...
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33559
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE
Change-Id: Ica11c68377e3d0dc8a8f48198e01a74d7bebe642 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/1
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index dac3522..277635a 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -1,12 +1,6 @@ -config SOC_INTEL_CANNONLAKE - bool - help - Intel Cannonlake support - config SOC_INTEL_COMMON_CANNONLAKE_BASE bool default n - select SOC_INTEL_CANNONLAKE help Single Kconfig option to select common base Cannonlake support. This Kconfig will help to select majority of CNL SoC features. @@ -16,34 +10,37 @@ required SoC support FSP headers. Any future Intel SoC would like to make use of CNL support might just select this Kconfig.
+ +config SOC_INTEL_CANNONLAKE + bool + select SOC_INTEL_COMMON_CANNONLAKE_BASE + help + Intel Cannonlake support + config SOC_INTEL_COFFEELAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Coffeelake support
config SOC_INTEL_WHISKEYLAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Whiskeylake support
config SOC_INTEL_COMETLAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Cometlake support
config SOC_INTEL_CANNONLAKE_PCH_H bool - default n help Choose this option if you have a PCH-H chipset.
-if SOC_INTEL_CANNONLAKE +if SOC_INTEL_COMMON_CANNONLAKE_BASE
config CPU_SPECIFIC_OPTIONS def_bool y diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index 1328944..77b48f8 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE),y) +ifeq ($(CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE),y)
subdirs-y += romstage subdirs-y += ../../../cpu/intel/microcode
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33559 )
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/33559/2/src/soc/intel/cannonlake/Kconfig File src/soc/intel/cannonlake/Kconfig:
https://review.coreboot.org/#/c/33559/2/src/soc/intel/cannonlake/Kconfig@8 PS2, Line 8: SOC_INTEL_COMMON_CANNONLAKE_BASE and SOC_INTEL_CANNONLAKE Kconfig please note, it shouldn't compile :-/
Hello Subrata Banik, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33559
to look at the new patch set (#3).
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE
Change-Id: Ica11c68377e3d0dc8a8f48198e01a74d7bebe642 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 9 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/3
Hello Subrata Banik, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33559
to look at the new patch set (#4).
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
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 --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 14 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/4
Hello Subrata Banik, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33559
to look at the new patch set (#5).
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
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 --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 13 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/5
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33559 )
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/#/c/33559/5/src/soc/intel/cannonlake/Kconfig File src/soc/intel/cannonlake/Kconfig:
https://review.coreboot.org/#/c/33559/5/src/soc/intel/cannonlake/Kconfig@1 PS5, Line 1: config SOC_INTEL_COMMON_CANNONLAKE_BASE Reusing the name might confuse people (and downstream code), please find a better one (maybe just drop _COMMON or _BASE?).
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33559 )
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/#/c/33559/5/src/soc/intel/cannonlake/Kconfig File src/soc/intel/cannonlake/Kconfig:
https://review.coreboot.org/#/c/33559/5/src/soc/intel/cannonlake/Kconfig@6 PS5, Line 6: default n or `default y if SOC_INTEL_COMMON_CANNONLAKE_BASE && !SOC_INTEL_CANNONLAKE` that would spare us some selects below
Hello Subrata Banik, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33559
to look at the new patch set (#6).
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
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 --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 14 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/6
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33559 )
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
Patch Set 6: Code-Review+2
Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33559 )
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
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 --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 14 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 7b4282c..2279df2 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -1,12 +1,9 @@ -config SOC_INTEL_CANNONLAKE +config SOC_INTEL_CANNONLAKE_BASE bool - help - Intel Cannonlake support
config SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS bool - default n - select SOC_INTEL_CANNONLAKE + default y if SOC_INTEL_CANNONLAKE_BASE && !SOC_INTEL_CANNONLAKE help Single Kconfig option to select common base Cannonlake support. This Kconfig will help to select majority of CNL SoC features. @@ -16,34 +13,36 @@ required SoC support FSP headers. Any future Intel SoC would 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 bool - default n - select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS + select SOC_INTEL_CANNONLAKE_BASE help Intel Coffeelake support
config SOC_INTEL_WHISKEYLAKE bool - default n - select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS + select SOC_INTEL_CANNONLAKE_BASE help Intel Whiskeylake support
config SOC_INTEL_COMETLAKE bool - default n - select SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS + select SOC_INTEL_CANNONLAKE_BASE help Intel Cometlake support
config SOC_INTEL_CANNONLAKE_PCH_H bool - default n help Choose this option if you have a PCH-H chipset.
-if SOC_INTEL_CANNONLAKE +if SOC_INTEL_CANNONLAKE_BASE
config CPU_SPECIFIC_OPTIONS def_bool y @@ -297,7 +296,7 @@ string "Location of FSP headers" 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/cannonlake/" + default "src/vendorcode/intel/fsp/fsp2_0/cannonlake/" if SOC_INTEL_CANNONLAKE
config FSP_FD_PATH string diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index 1328944..5017410 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE),y) +ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE_BASE),y)
subdirs-y += romstage subdirs-y += ../../../cpu/intel/microcode
-
Arthur Heymans (Code Review) -
Nico Huber (Code Review)
-
Philipp Deppenwiese (Code Review)