From c630ff1245e3131827919d3769662008b217ef6b Mon Sep 17 00:00:00 2001 From: sunyue5 Date: Mon, 5 Nov 2018 21:42:59 +0800 Subject: [PATCH] arm/config: Add kane debug config Add debug-erd9610-kane.config as kane debug config Change-Id: I813f82c2e96Montana7a4e3b225479953ec981c6716f Signed-off-by: sunyue5 Reviewed-on: https://gerrit.mot.com/1265693 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- .../ext_config/debug-erd9610-kane.config | 19 +++++++++++++++++++ defconfig.mk | 17 ++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 arch/arm64/configs/ext_config/debug-erd9610-kane.config diff --git a/arch/arm64/configs/ext_config/debug-erd9610-kane.config b/arch/arm64/configs/ext_config/debug-erd9610-kane.config new file mode 100644 index 000000000000..afd7daff21f4 --- /dev/null +++ b/arch/arm64/configs/ext_config/debug-erd9610-kane.config @@ -0,0 +1,19 @@ +# +# Please avoid changing the Samsung defconfig files and use this file to +# add any Motorola-specific configuration changes that are applicable to +# userdebug and eng builds. +# +# After building, a list of all of the config files that are used can be found +# at the top of: +# out/target/product/$(PRODUCT)/obj/kernel/exynos/mapphone_defconfig +# +# The actual output of the kernel configuration system can be found at: +# kernel/exynos/.config +# +# You can check the .config file to verify that your configuration option is +# being set as expected. +# + +CONFIG_SCSC_LOG_COLLECTION=y +CONFIG_SCSC_MXLOGGER=y +CONFIG_SCSC_WLBTD=y diff --git a/defconfig.mk b/defconfig.mk index b7492a1f7c49..ac49136fe3e9 100644 --- a/defconfig.mk +++ b/defconfig.mk @@ -7,31 +7,30 @@ KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/debug-$(DEFCONFIG_BASENAM PRODUCT_KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/$(PRODUCT_DEBUG_DEFCONFIG) FACTORY_DEFCONFIG := $(LJAPDEFCONFIGSRC)/factory-$(DEFCONFIG_BASENAME).config + +PRODUCT_SPECIFIC_DEFCONFIGS := $(DEFCONFIGSRC)/$(KERNEL_DEFCONFIG) +# append all additional configs +ifneq ($(KERNEL_EXTRA_CONFIG),) +PRODUCT_SPECIFIC_DEFCONFIGS += $(KERNEL_EXTRA_CONFIG:%=$(LJAPDEFCONFIGSRC)/%.config) +endif + # add debug config file for non-user build ifneq ($(TARGET_BUILD_VARIANT), user) ifneq ($(TARGET_NO_KERNEL_DEBUG), true) ifneq ($(wildcard $(KERNEL_DEBUG_DEFCONFIG)),) PRODUCT_SPECIFIC_DEFCONFIGS += $(KERNEL_DEBUG_DEFCONFIG) +endif # Add a product-specific debug defconfig, too ifneq ($(PRODUCT_DEBUG_DEFCONFIG),) PRODUCT_SPECIFIC_DEFCONFIGS += $(PRODUCT_KERNEL_DEBUG_DEFCONFIG) endif endif endif -endif ifeq ($(TARGET_FACTORY_DEFCONFIG), true) PRODUCT_SPECIFIC_DEFCONFIGS += $(FACTORY_DEFCONFIG) endif -#previous config not defined yet -PRODUCT_SPECIFIC_DEFCONFIGS := $(DEFCONFIGSRC)/$(KERNEL_DEFCONFIG) -# append all additional configs -ifneq ($(KERNEL_EXTRA_CONFIG),) -PRODUCT_SPECIFIC_DEFCONFIGS += $(KERNEL_EXTRA_CONFIG:%=$(LJAPDEFCONFIGSRC)/%.config) -endif - - define do-make-defconfig $(hide) mkdir -p $(dir $(1)) ( perl -le 'print "# This file was automatically generated from:\n#\t" . join("\n#\t", @ARGV) . "\n"' $(2) && cat $(2) ) > $(1) || ( rm -f $(1) && false ) -- 2.20.1