(CR):[factory]:kernel:separate the robusta2 defconfig from erd9609 defconfig
authorhq_guohongtao5_tmp <guohongtao5@huaqin.com>
Mon, 24 Dec 2018 09:28:53 +0000 (17:28 +0800)
committerxiest1 <xiest1@lenovo.com>
Tue, 5 Nov 2019 09:30:08 +0000 (17:30 +0800)
separate the robusta2 defconfig from erd9609 defconfig

Change-Id: I10af69381d4c48d927aa7c7175f18bd79e192789
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>
AndroidKernel.mk
arch/arm64/configs/robusta2_factory_defconfig [new file with mode: 0644]

index bd94d56c1a9761c5f98aa8eeb856b75d55978fa7..bc2a4379119c3fc173f507a8d793d5a171e3458f 100644 (file)
@@ -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 (file)
index 0000000..3688b90
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_PRINTK_UTC_TIME=y