Change in coreboot[master]: soc/intel/skylake: Improve Kconfig

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/27141

Change subject: soc/intel/skylake: Improve Kconfig
......................................................................

soc/intel/skylake: Improve Kconfig

Kabylake always uses FSP2.0 so this should not be an option for
mainboards.

SKIP_FSP_CAR is only meaningful for FSP1.1.
FSP_CAR is only meaningful for FSP2.0.

Change-Id: I3868b7688322cc7c0099058fc64106468aa82c32
Signed-off-by: Arthur Heymans 
---
M src/mainboard/google/eve/Kconfig
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/poppy/Kconfig
M src/soc/intel/skylake/Kconfig
4 files changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/27141/1

diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index 9205651..0c740da 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -18,7 +18,6 @@
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_I2C_TPM_CR50
    select MAINBOARD_HAS_TPM2
-	select MAINBOARD_USES_FSP2_0
    select SOC_INTEL_KABYLAKE

config VBOOT
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 7b3ba45..a26aa30 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -13,7 +13,6 @@
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_USES_FSP2_0
    select NO_FADT_8042
    select SOC_INTEL_KABYLAKE
    select MAINBOARD_HAS_SPI_TPM_CR50
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 2d9c187..66d2212 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -11,7 +11,6 @@
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_USES_FSP2_0
    select SOC_INTEL_KABYLAKE
    select MAINBOARD_HAS_TPM2

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 3e0158b..7f84023 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -78,6 +78,7 @@
 config MAINBOARD_USES_FSP2_0
    bool
    default n
+	default y if SOC_INTEL_KABYLAKE

config USE_FSP2_0_DRIVER
    def_bool y
@@ -269,6 +270,8 @@
    help
      Include DSP firmware settings for DA7219 headset codec.

+if USE_FSP2_0_DRIVER
+
 choice
    prompt "Cache-as-ram implementation"
    default USE_SKYLAKE_CAR_NEM_ENHANCED
@@ -295,9 +298,12 @@

endchoice

+endif
+
 config SKIP_FSP_CAR
    bool "Skip cache as RAM setup in FSP"
    default y
+	depends on USE_FSP1_1_DRIVER
    help
      Skip Cache as RAM setup in FSP.