hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/20607 CVE: NA -------------------------------- The Hisilicon SoC drivers block exists twice in openeuler_defconfig: commit a89f3c7be5dc4 ("arm64: openeuler_defconfig: add Kunpeng HCCS config") added a second copy after the Xilinx SoC drivers block, while the original one was already present. The later assignments override the former ones, making 'make openeuler_defconfig' report: arch/arm64/configs/openeuler_defconfig:6849:warning: override: reassigning to symbol KUNPENG_HCCS arch/arm64/configs/openeuler_defconfig:6850:warning: override: reassigning to symbol HISI_HBMDEV arch/arm64/configs/openeuler_defconfig:6851:warning: override: reassigning to symbol HISI_HBMCACHE Remove the duplicated block and set the remaining one to the values which actually took effect before (the later assignment won), so the generated .config stays unchanged. Fixes: a89f3c7be5dc ("arm64: openeuler_defconfig: add Kunpeng HCCS config") Signed-off-by: Ziming Du <duziming2@huawei.com> --- arch/arm64/configs/openeuler_defconfig | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 67efe107ebbf2..4bd489003b750 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -6795,8 +6795,8 @@ CONFIG_SMMU_BYPASS_DEV=y # # Hisilicon SoC drivers # -# CONFIG_HISI_HBMDEV is not set -# CONFIG_HISI_HBMCACHE is not set +CONFIG_HISI_HBMDEV=y +CONFIG_HISI_HBMCACHE=m CONFIG_KUNPENG_HCCS=m CONFIG_HISI_SOC_CACHE=y CONFIG_HISI_SOC_HHA=m @@ -6842,14 +6842,6 @@ CONFIG_QCOM_KRYO_L2_ACCESSORS=y # Xilinx SoC drivers # # end of Xilinx SoC drivers - -# -# Hisilicon SoC drivers -# -CONFIG_KUNPENG_HCCS=m -CONFIG_HISI_HBMDEV=y -CONFIG_HISI_HBMCACHE=m -# end of Hisilicon SoC drivers # end of SOC (System On Chip) specific Drivers CONFIG_PM_DEVFREQ=y -- 2.43.0