These kernel options were added due to the new drivers in the v5.10/standard/cn-sdkv5.4/octeon branch, but they are put into the wrong cfg file marvell-cn96xx.cfg since this file is also used by the v5.10/standard/cn-sdkv4.18/cn96xx branch. Then these new kernel options cause kernel config check warnings on the v5.10/standard/cn-sdkv4.18/cn96xx branch. So move them to the v5.10/standard/cn-sdkv5.4/octeon specific cfg file sdkv5.4.cfg.
Signed-off-by: Carlos Dominguez <[email protected]> --- bsp/marvell-cn96xx/marvell-cn96xx.cfg | 8 -------- bsp/marvell-cn96xx/sdkv5.4.cfg | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg index 9bf8c508..13250aa5 100644 --- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg +++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg @@ -123,7 +123,6 @@ CONFIG_ARM_SCMI_CPUFREQ=y # GHES CONFIG_ACPI=y -CONFIG_EDAC_OCTEONTX=y # CORESIGHT CONFIG_CORESIGHT=y @@ -139,10 +138,3 @@ CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y # NPA CONFIG_OCTEONTX2_NPA_PF=y - -# MARVELL_UB -CONFIG_MARVELL_UB=y -CONFIG_MARVELL_UB_GEN_DRIVER=y - -# AVS_RESET -CONFIG_MARVELL_AVS_RESET=y diff --git a/bsp/marvell-cn96xx/sdkv5.4.cfg b/bsp/marvell-cn96xx/sdkv5.4.cfg index 5f0361ca..8e8cfdac 100644 --- a/bsp/marvell-cn96xx/sdkv5.4.cfg +++ b/bsp/marvell-cn96xx/sdkv5.4.cfg @@ -17,3 +17,13 @@ # OCTEONTX2_CCU CONFIG_OCTEONTX2_CCU=y + +# GHES +CONFIG_EDAC_OCTEONTX=y + +# MARVELL_UB +CONFIG_MARVELL_UB=y +CONFIG_MARVELL_UB_GEN_DRIVER=y + +# AVS_RESET +CONFIG_MARVELL_AVS_RESET=y -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11455): https://lists.yoctoproject.org/g/linux-yocto/message/11455 Mute This Topic: https://lists.yoctoproject.org/mt/92305693/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
