From: hq_guohongtao5_tmp Date: Mon, 24 Dec 2018 09:28:53 +0000 (+0800) Subject: (CR):[factory]:kernel:separate the robusta2 defconfig from erd9609 defconfig X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e5a9342328d224435db31cf7d93211dff93273f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git (CR):[factory]:kernel:separate the robusta2 defconfig from erd9609 defconfig separate the robusta2 defconfig from erd9609 defconfig Change-Id: I10af69381d4c48d927aa7c7175f18bd79e192789 Signed-off-by: hq_guohongtao5_tmp --- diff --git a/AndroidKernel.mk b/AndroidKernel.mk index bd94d56c1a97..bc2a4379119c 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -65,6 +65,15 @@ KERNEL_MERGE_CONFIG := $(TARGET_KERNEL_SOURCE)/scripts/kconfig/merge_config.sh KERNEL_CONFIG_BASE := $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs KERNEL_DEFCONFIG_PATH := $(KERNEL_CONFIG_BASE)/$(KERNEL_DEFCONFIG) +ifeq ($(TARGET_PRODUCT),kane_factory) +ERD9609_DEFCONFIG := erd9610_defconfig +ERD9609_DEFCONFIG_PATH := $(KERNEL_CONFIG_BASE)/$(ERD9609_DEFCONFIG) +ROBUSTA2_FACTORY_DEFCONFIG := robusta2_factory_defconfig +ROBUSTA2_FACTORY_DEFCONFIG_PATH := $(KERNEL_CONFIG_BASE)/$(ROBUSTA2_FACTORY_DEFCONFIG) +ERD9609_ROBUSTA2_FACTORY_DEFCONFIG := erd9610_robusta2_factory_defconfig +ERD9609_ROBUSTA2_FACTORY_DEFCONFIG_PATH := $(KERNEL_CONFIG_BASE)/$(ERD9609_ROBUSTA2_FACTORY_DEFCONFIG) +endif + ifeq ($(KERNEL_DEFCONFIG),) $(error Kernel configuration not defined, cannot build kernel) else @@ -98,6 +107,9 @@ kernel-distclean: $(MAKE) -C $(TARGET_KERNEL_SOURCE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) distclean $(KERNEL_CONFIG): phony-rebuild +ifeq ($(TARGET_PRODUCT),kane_factory) + cat $(ERD9609_DEFCONFIG_PATH) $(ROBUSTA2_FACTORY_DEFCONFIG_PATH) > $(ERD9609_ROBUSTA2_FACTORY_DEFCONFIG_PATH) +endif $(hide) echo "make $(KERNEL_DEFCONFIG)" $(MAKE_CONFIG_CMD) diff --git a/arch/arm64/configs/robusta2_factory_defconfig b/arch/arm64/configs/robusta2_factory_defconfig new file mode 100644 index 000000000000..3688b90f5ed2 --- /dev/null +++ b/arch/arm64/configs/robusta2_factory_defconfig @@ -0,0 +1 @@ +CONFIG_PRINTK_UTC_TIME=y