From: huangzq2 Date: Tue, 29 Jan 2019 13:38:58 +0000 (+0800) Subject: clean the kernel configs and include samsung user kernel config by Defenderault X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8a616cdb092623d000a27f85f2036b9baac1323;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git clean the kernel configs and include samsung user kernel config by Defenderault Change-Id: Iacca1f4961ccc0485f5b8721555f7fd922077c77 Signed-off-by: huangzq2 Reviewed-on: https://gerrit.mot.com/1302631 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/arch/arm64/configs/ext_config/debug-erd9610.config b/arch/arm64/configs/ext_config/debug-erd9610.config index 64cef242af26..ccdeb8ac9b90 100644 --- a/arch/arm64/configs/ext_config/debug-erd9610.config +++ b/arch/arm64/configs/ext_config/debug-erd9610.config @@ -54,14 +54,3 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_SPINLOCK_BITE_ON_BUG=y -CONFIG_PAGE_POISONING=y -# CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y - -# Disable CFI on debug build -# CONFIG_CFI is not set -# CONFIG_LTO is not set -# CONFIG_CFI_CLANG is not set -# CONFIG_LTO_CLANG is not set -CONFIG_CFI_PERMISSIVE=y -CONFIG_LTO_NONE=y diff --git a/arch/arm64/configs/ext_config/moto-erd9610.config b/arch/arm64/configs/ext_config/moto-erd9610.config index ed78a6994cca..b73e7109b982 100644 --- a/arch/arm64/configs/ext_config/moto-erd9610.config +++ b/arch/arm64/configs/ext_config/moto-erd9610.config @@ -34,39 +34,15 @@ CONFIG_MEMCG_SWAP=y CONFIG_BALANCE_ANON_FILE_RECLAIM=y # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set # CONFIG_KSM is not set +# CONFIG_SLUB_DEBUG is not set +# CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_PAGE_OWNER is not set +# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_PRINTK_PROCESS is not set -CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE=y -# CONFIG_CGROUP_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -# CONFIG_PM_DEBUG is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT is not set -# CONFIG_PAGE_POISONING is not set -# CONFIG_PAGE_POISONING_NO_SANITY is not set -# CONFIG_PAGE_POISONING_ZERO is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VM_VMACACHE is not set -# CONFIG_DEBUG_VM_RB is not set -# CONFIG_DEBUG_VM_PGFLAGS is not set -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_SLUB_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_WQ_WATCHDOG is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set CONFIG_USB_GADGET_VBUS_DRAW=500 # CONFIG_RC_CORE is not set # CONFIG_EXT2_FS is not set diff --git a/defconfig.mk b/defconfig.mk index a42c49ee030a..1111203f0fe1 100644 --- a/defconfig.mk +++ b/defconfig.mk @@ -3,7 +3,7 @@ LJAPDEFCONFIGSRC := ${DEFCONFIGSRC}/ext_config ifeq ($(DEFCONFIG_BASENAME),) DEFCONFIG_BASENAME := $(subst -perf,,$(subst _defconfig,,$(KERNEL_DEFCONFIG))) endif -PRODUCT_SPECIFIC_DEFCONFIGS := $(DEFCONFIGSRC)/$(KERNEL_DEFCONFIG) $(LJAPDEFCONFIGSRC)/moto-$(DEFCONFIG_BASENAME).config +PRODUCT_SPECIFIC_DEFCONFIGS := $(DEFCONFIGSRC)/$(KERNEL_DEFCONFIG) $(DEFCONFIGSRC)/$(TARGET_SOC)_user.cfg $(LJAPDEFCONFIGSRC)/moto-$(DEFCONFIG_BASENAME).config TARGET_DEFCONFIG := $(KERNEL_OUT)/mapphone_defconfig KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/debug-$(DEFCONFIG_BASENAME).config PRODUCT_KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/$(PRODUCT_DEBUG_DEFCONFIG)