From 9b86328c04866613be929a85bb34a1235bb79ebe Mon Sep 17 00:00:00 2001 From: linyiyu Date: Sat, 29 Jan 2022 19:55:16 +0800 Subject: [PATCH] IssueNo:https://gitee.com/openharmony/vendor_hisilicon/issues/I4SJM4 Description:support one app demo on hi3516dv300 Sig:OTHERS Feature or Bgfix:Feature Binary Source: No Signed-off-by: linyiyu --- kernel.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel.mk b/kernel.mk index ecab442..6a9353a 100755 --- a/kernel.mk +++ b/kernel.mk @@ -45,13 +45,14 @@ KERNEL_CROSS_COMPILE += CC="$(CLANG_CC)" KERNEL_CROSS_COMPILE += CROSS_COMPILE="$(KERNEL_TARGET_TOOLCHAIN_PREFIX)" KERNEL_MAKE := \ - PATH="$(BOOT_IMAGE_PATH):$$PATH" \ - $(KERNEL_PREBUILT_MAKE) + PATH="$(BOOT_IMAGE_PATH):$$PATH" \ + $(KERNEL_PREBUILT_MAKE) ifneq ($(findstring $(BUILD_TYPE), small standard),) DEVICE_PATCH_DIR := $(OHOS_BUILD_HOME)/kernel/linux/patches/${KERNEL_VERSION}/$(DEVICE_NAME)_patch DEVICE_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME).patch +PRODUCT_PATCH_FILE := $(OHOS_BUILD_HOME)/vendor/hisilicon/watchos/patchs/$(DEVICE_NAME).patch HDF_PATCH_FILE := $(DEVICE_PATCH_DIR)/hdf.patch SMALL_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME)_$(BUILD_TYPE).patch KERNEL_IMAGE_FILE := $(KERNEL_SRC_TMP_PATH)/arch/$(KERNEL_ARCH)/boot/$(KERNEL_IMAGE) @@ -62,8 +63,14 @@ export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH) $(KERNEL_IMAGE_FILE): $(hide) echo "build kernel..." $(hide) rm -rf $(KERNEL_SRC_TMP_PATH);mkdir -p $(KERNEL_SRC_TMP_PATH);cp -arfL $(KERNEL_SRC_PATH)/* $(KERNEL_SRC_TMP_PATH)/ - $(hide) $(OHOS_BUILD_HOME)/drivers/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(HDF_PATCH_FILE) + $(hide) $(OHOS_BUILD_HOME)/drivers/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(HDF_PATCH_FILE) + +ifeq ($(PRODUCT_PATH), vendor/hisilicon/watchos) + $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(PRODUCT_PATCH_FILE) +else $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(DEVICE_PATCH_FILE) +endif + ifneq ($(findstring $(BUILD_TYPE), small),) $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(SMALL_PATCH_FILE) endif -- Gitee