From be08359fdb07ff9c1c9cccd15d8c95e27041796e Mon Sep 17 00:00:00 2001 From: linyiyu Date: Sat, 29 Jan 2022 11:47:14 +0800 Subject: [PATCH 1/4] IssueNo:#I4SEFY Description:watchos launcher 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 From 5ac19a36a223e495bf2930650c11332b17ad3e3d Mon Sep 17 00:00:00 2001 From: linyiyu Date: Sat, 29 Jan 2022 11:50:30 +0800 Subject: [PATCH 2/4] IssueNo:#I4SEFY Description:watchos launcher Sig:OTHERS Feature or Bgfix:Feature Binary Source: No Signed-off-by: linyiyu --- kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel.mk b/kernel.mk index 6a9353a..08b1125 100755 --- a/kernel.mk +++ b/kernel.mk @@ -45,8 +45,8 @@ 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),) -- Gitee From cc6cc6ee28780ddc25361e8e17a8d44dec6b7c12 Mon Sep 17 00:00:00 2001 From: linyiyu Date: Sat, 29 Jan 2022 11:50:30 +0800 Subject: [PATCH 3/4] IssueNo:#I4SEFY Description:support watchos demo based on hi3516dv300 Sig:OTHERS Feature or Bgfix:Feature Binary Source: No Signed-off-by: linyiyu --- kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel.mk b/kernel.mk index 6a9353a..08b1125 100755 --- a/kernel.mk +++ b/kernel.mk @@ -45,8 +45,8 @@ 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),) -- Gitee From d88942bae793e2d81a05df7d7b47384a2d0707af Mon Sep 17 00:00:00 2001 From: linyiyu Date: Sat, 29 Jan 2022 11:47:14 +0800 Subject: [PATCH 4/4] IssueNo:#I4SEFY Description:support watchos demo based on hi3516dv300 Sig:OTHERS Feature or Bgfix:Feature Binary Source: No Signed-off-by: linyiyu --- kernel.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel.mk b/kernel.mk index ecab442..08b1125 100755 --- a/kernel.mk +++ b/kernel.mk @@ -52,6 +52,7 @@ KERNEL_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