The branches based on SDK v5.15 linux kernel have been created, then it's
time to update the kernel cache configs to compatible with these new branches.

Signed-off-by: Zhantao Tang <[email protected]>
---
 bsp/nxp-s32g/nxp-s32g.cfg | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/bsp/nxp-s32g/nxp-s32g.cfg b/bsp/nxp-s32g/nxp-s32g.cfg
index 4cea8b8c..405477d5 100644
--- a/bsp/nxp-s32g/nxp-s32g.cfg
+++ b/bsp/nxp-s32g/nxp-s32g.cfg
@@ -14,12 +14,11 @@
 
 CONFIG_ARM64=y
 CONFIG_ARCH_S32=y
-CONFIG_SOC_S32GEN1=y
+CONFIG_SOC_S32CC=y
 CONFIG_SCHED_MC=y
 CONFIG_ARM_SMMU=y
 
 CONFIG_PINCTRL_S32CC=y
-CONFIG_PINCTRL_S32CC_CORE=y
 
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
@@ -30,6 +29,10 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 
+CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE=y
+#To keep align with SDK, unset the ARM_SCMI_POWER_DOMAIN config
+# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
+
 #CAN
 CONFIG_CAN=y
 CONFIG_CAN_VCAN=y
@@ -38,12 +41,14 @@ CONFIG_CAN_FLEXCAN=y
 
 #Ethernet
 CONFIG_STMMAC_ETH=y
+CONFIG_DWMAC_DWC_QOS_ETH=y
 CONFIG_AT803X_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_AQUANTIA_PHY=y
 CONFIG_BRIDGE=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_TAG_SJA1105=y
+CONFIG_NXP_TJA11XX_PHY=y
 CONFIG_NET_DSA_SJA1105=y
 CONFIG_NET_DSA_SJA1105_PTP=y
 
@@ -62,7 +67,7 @@ CONFIG_GPIO_S32CC=y
 
 #PCIE
 CONFIG_PCI=y
-CONFIG_PCI_S32GEN1=y
+CONFIG_PCI_S32CC=y
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_ENDPOINT=y
@@ -82,7 +87,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_ULPI_GENERIC=y
 
 #MMC
 CONFIG_MMC=y
@@ -111,17 +115,17 @@ CONFIG_INPUT_UINPUT=y
 
 # Thermal
 CONFIG_THERMAL=y
-CONFIG_S32GEN1_THERMAL=y
+CONFIG_S32CC_THERMAL=y
 
 # ADC
 CONFIG_IIO=y
-CONFIG_S32_ADC=y
+CONFIG_S32CC_ADC=y
 
 # PWM
 CONFIG_PWM=y
 CONFIG_PWM_FSL_FTM=y
 
-CONFIG_FCCU=y
+CONFIG_S32CC_FCCU=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 
@@ -133,7 +137,7 @@ CONFIG_SPI_FSL_QUADSPI=y
 
 #RTC
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_S32GEN1=y
+CONFIG_RTC_DRV_S32CC=y
 CONFIG_RTC_DRV_PCF85063=y
 
 #I2C
@@ -142,11 +146,12 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
 
 #Watchdog
-CONFIG_SAC58R_WDT=y
+CONFIG_S32CC_WDT=y
 
 #NVME
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_TARGET=y
+CONFIG_NVMEM_S32CC_SIUL2=y
 
 #LLCE
 CONFIG_CAN_LLCE=y
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12326): 
https://lists.yoctoproject.org/g/linux-yocto/message/12326
Mute This Topic: https://lists.yoctoproject.org/mt/97898343/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to