From 4a8c8cd617ce563fb75119d29b971fd90e798972 Mon Sep 17 00:00:00 2001 From: liuyc20 Date: Fri, 4 Dec 2020 09:59:59 +0800 Subject: [PATCH] Revert "(CR): configure cfi permissve for user build" This reverts commit f371f58ee5306333560fb67bfdec51145059087a. correct usb_ether_xmit API return value type Mot-CRs-fixed:(CR) Change-Id: Ifa420b2e0a3ef17d1900be1b45790c9d8599a160 Reviewed-on: https://gerrit.mot.com/1818887 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Yonghua Yan Reviewed-by: Xiaojun Ji Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- arch/arm64/configs/vendor/ext_config/debug-holi.config | 1 - arch/arm64/configs/vendor/ext_config/factory-holi.config | 1 - arch/arm64/configs/vendor/ext_config/moto-holi.config | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/vendor/ext_config/debug-holi.config b/arch/arm64/configs/vendor/ext_config/debug-holi.config index dabd9876d6c3..26bda5b0d09d 100644 --- a/arch/arm64/configs/vendor/ext_config/debug-holi.config +++ b/arch/arm64/configs/vendor/ext_config/debug-holi.config @@ -14,7 +14,6 @@ # being set as expected. # CONFIG_DEBUG_FS=y -CONFIG_CFI_PERMISSIVE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE is not set # CONFIG_SLUB_DEBUG_ON is not set diff --git a/arch/arm64/configs/vendor/ext_config/factory-holi.config b/arch/arm64/configs/vendor/ext_config/factory-holi.config index edb127862aa0..1ae7affe3eec 100644 --- a/arch/arm64/configs/vendor/ext_config/factory-holi.config +++ b/arch/arm64/configs/vendor/ext_config/factory-holi.config @@ -13,7 +13,6 @@ # You can check the .config file to verify that your configuration option is # being set as expected. # -CONFIG_CFI_PERMISSIVE=y CONFIG_SERIAL_MSM_GENI_CONSOLE=y CONFIG_QCOM_RTB=y CONFIG_QCOM_RTB_QGKI=y diff --git a/arch/arm64/configs/vendor/ext_config/moto-holi.config b/arch/arm64/configs/vendor/ext_config/moto-holi.config index df9dad2b7e62..aef6a24d0481 100644 --- a/arch/arm64/configs/vendor/ext_config/moto-holi.config +++ b/arch/arm64/configs/vendor/ext_config/moto-holi.config @@ -30,4 +30,3 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=y -CONFIG_CFI_PERMISSIVE=y