According to the changes before linux-4.18-rc6, we must add new
dependency for some config option or modify them value.

1. If "CONFIG_PINCTRL_SUNRISEPOINT=m", CONFIG_PINCTRL_INTEL cann't
be set y, because CONFIG_PINCTRL_INTEL is selected by
CONFIG_PINCTRL_SUNRISEPOINT.

2. The dependency of CONFIG_MMC_REALTEK_PCI is change to
CONFIG_MISC_RTSX_PCI.

3. CONFIG_INTEL_SOC_PMIC_BXTWC is a new dependency for
CONFIG_INTEL_BXT_PMIC_THERMAL.

4. The value of CONFIG_HW_RANDOM_TPM must be equal to CONFIG_TCG_TPM.

Signed-off-by: Hongzhi.Song <hongzhi.s...@windriver.com>
---
 features/intel-pinctrl/intel-pinctrl.cfg | 2 +-
 features/mmc/mmc-realtek.cfg             | 2 +-
 features/thermal/coretemp.cfg            | 1 +
 features/tpm/tpm.cfg                     | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/intel-pinctrl/intel-pinctrl.cfg 
b/features/intel-pinctrl/intel-pinctrl.cfg
index 7b672b30..1555c5ba 100644
--- a/features/intel-pinctrl/intel-pinctrl.cfg
+++ b/features/intel-pinctrl/intel-pinctrl.cfg
@@ -3,4 +3,4 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_BROXTON=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_SUNRISEPOINT=y
diff --git a/features/mmc/mmc-realtek.cfg b/features/mmc/mmc-realtek.cfg
index 33073255..63bc02c8 100644
--- a/features/mmc/mmc-realtek.cfg
+++ b/features/mmc/mmc-realtek.cfg
@@ -1,2 +1,2 @@
-CONFIG_MFD_RTSX_PCI=m
+CONFIG_MISC_RTSX_PCI=m
 CONFIG_MMC_REALTEK_PCI=m
diff --git a/features/thermal/coretemp.cfg b/features/thermal/coretemp.cfg
index 7d24566e..2bec18b6 100644
--- a/features/thermal/coretemp.cfg
+++ b/features/thermal/coretemp.cfg
@@ -14,4 +14,5 @@ CONFIG_INT340X_THERMAL=m
 CONFIG_INTEL_POWERCLAMP=m
 
 # Intel PMIC thermal driver
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
diff --git a/features/tpm/tpm.cfg b/features/tpm/tpm.cfg
index 113f37c7..fc285121 100644
--- a/features/tpm/tpm.cfg
+++ b/features/tpm/tpm.cfg
@@ -1,6 +1,7 @@
 # Enable TPM device drivers.
 CONFIG_TCG_TPM=y
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 CONFIG_SPI=y
-- 
2.11.0

-- 
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Reply via email to