From baa5f17656c7a149fb97e37b083a3290f2f9593c Mon Sep 17 00:00:00 2001 From: jixj Date: Thu, 6 May 2021 14:59:31 +0800 Subject: [PATCH] Change device name from cyprus to cypfg for Cyprus 5G device name "cyprus" was already used by ODM1 project. So need change device name from cyprus to cypfg for Cyprus 5G project. Change-Id: I7b4ce66495d3232b928e0b6fdcfaa44d0e16e7f7 Reviewed-on: https://gerrit.mot.com/1940602 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiaojun Ji Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../{debug-holi-cyprus.config => debug-holi-cypfg.config} | 0 ...factory-holi-cyprus.config => factory-holi-cypfg.config} | 0 .../{moto-holi-cyprus.config => moto-holi-cypfg.config} | 2 +- drivers/soc/qcom/Kconfig | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm64/configs/vendor/ext_config/{debug-holi-cyprus.config => debug-holi-cypfg.config} (100%) rename arch/arm64/configs/vendor/ext_config/{factory-holi-cyprus.config => factory-holi-cypfg.config} (100%) rename arch/arm64/configs/vendor/ext_config/{moto-holi-cyprus.config => moto-holi-cypfg.config} (97%) diff --git a/arch/arm64/configs/vendor/ext_config/debug-holi-cyprus.config b/arch/arm64/configs/vendor/ext_config/debug-holi-cypfg.config similarity index 100% rename from arch/arm64/configs/vendor/ext_config/debug-holi-cyprus.config rename to arch/arm64/configs/vendor/ext_config/debug-holi-cypfg.config diff --git a/arch/arm64/configs/vendor/ext_config/factory-holi-cyprus.config b/arch/arm64/configs/vendor/ext_config/factory-holi-cypfg.config similarity index 100% rename from arch/arm64/configs/vendor/ext_config/factory-holi-cyprus.config rename to arch/arm64/configs/vendor/ext_config/factory-holi-cypfg.config diff --git a/arch/arm64/configs/vendor/ext_config/moto-holi-cyprus.config b/arch/arm64/configs/vendor/ext_config/moto-holi-cypfg.config similarity index 97% rename from arch/arm64/configs/vendor/ext_config/moto-holi-cyprus.config rename to arch/arm64/configs/vendor/ext_config/moto-holi-cypfg.config index 7fb00ded132e..e805d169eea8 100644 --- a/arch/arm64/configs/vendor/ext_config/moto-holi-cyprus.config +++ b/arch/arm64/configs/vendor/ext_config/moto-holi-cypfg.config @@ -13,7 +13,7 @@ # You can check the .config file to verify that your configuration option is # being set as expected. # -CONFIG_CYPRUS_DTB=y +CONFIG_CYPFG_DTB=y # CONFIG_NFC_QTI_I2C is not set CONFIG_FS_EPOLL_WAKEUP_DEBUG=y CONFIG_ZRAM_WRITEBACK=y diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 1301457d637f..4ba2e7c11011 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -36,12 +36,12 @@ config CORFUP_DTB Only include CORFUP specific DTBs to limit the number that get built during kernel compilation. -config CYPRUS_DTB +config CYPFG_DTB depends on ARCH_QCOM default n - bool "CYPRUS DTBs" + bool "CYPFG DTBs" help - Only include CYPRUS specific DTBs to limit the number that + Only include CYPFG specific DTBs to limit the number that get built during kernel compilation. config QCOM_AOSS_QMP