!105 kernel common patch

Merge pull request !105 from 朱佳鑫/myfeature
This commit is contained in:
openharmony_ci
2022-07-14 12:58:33 +00:00
committed by Gitee
3 changed files with 27 additions and 18 deletions
+13 -8
View File
@@ -27,14 +27,19 @@ The vendor provides the driver code of the chip architecture.
```
kernel/linux/patches
├── linux-4.19 # linux-4.19 patches
└── hi3516dv300_patch
── hi3516dv300.patch # linux-4.19 Hi3516D V300 SOC patches
└── hdf.patch # linux-4.19 Hi3516D V300 HDF patches
├── linux-4.19 # linux-4.19 patches
   ├── common_patch
   ── hdf.patch # linux-4.19 HDF patches
   └── hi3516dv300_patch
│   └── hi3516dv300.patch # linux-4.19 Hi3516D V300 SOC patches
└── linux-5.10
── hi3516dv300_patch
── hi3516dv300.patch # linux-5.10 Hi3516D V300 SOC patches
└── hdf.patch # linux-5.10 Hi3516D V300 HDF patches
── common_patch
── hdf.patch # linux-5.10 HDF patches
└── hi3516dv300_patch
│ └── hi3516dv300.patch # linux-5.10 Hi3516D V300 SOC patches
└── rkrk3568_patch
├── kernel.patch # linux-5.10 rk3568 SOC patches
└── hdf.patch # linux-5.10 rk3568 customized HDF patches
```
## Usage<a name="section1393789267"></a>
@@ -44,7 +49,7 @@ kernel/linux/patches
Apply the HDF kernel patches matching your kernel version. For details, see the method in **kernel.mk** in the **kernel/linux/build** repository.
```
$(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(HDF_PATCH_FILE)
$(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(KERNEL_PATCH_PATH) $(DEVICE_NAME)
```
2. Apply the chip driver patches.
+13 -8
View File
@@ -27,14 +27,19 @@ hi3516dv300_small.patch: 在Hi3516DV300芯片上支持arm架构的内核启动
```
kernel/linux/patches
├── linux-4.19 # linux-4.19 相关patch
└── hi3516dv300_patch
── hi3516dv300.patch # linux-4.19 hi3516dv300 SOC patch
└── hdf.patch # linux-4.19 hi3516dv300 hdf patch
├── linux-4.19 # linux-4.19 相关patch
   ├── common_patch
   ── hdf.patch # linux-4.19 HDF patches
   └── hi3516dv300_patch
│   └── hi3516dv300.patch # linux-4.19 Hi3516D V300 SOC patches
└── linux-5.10
── hi3516dv300_patch
── hi3516dv300.patch # linux-5.10 hi3516dv300 SOC patch
└── hdf.patch # linux-5.10 hi3516dv300 hdf patch
── common_patch
── hdf.patch # linux-5.10 HDF patches
└── hi3516dv300_patch
│ └── hi3516dv300.patch # linux-5.10 Hi3516D V300 SOC patches
└── rkrk3568_patch
├── kernel.patch # linux-5.10 rk3568 SOC patches
└── hdf.patch # linux-5.10 rk3568 定制 HDF patches
```
## 使用说明<a name="section1393789267"></a>
@@ -44,7 +49,7 @@ kernel/linux/patches
在kernel/linux/build仓中,按照kernel.mk中HDF的补丁合入方法,合入不同内核版本对应的HDF内核补丁:
```
$(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(HDF_PATCH_FILE)
$(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(KERNEL_PATCH_PATH) $(DEVICE_NAME)
```
2. 合入芯片平台驱动补丁
Executable → Regular
+1 -2
View File
@@ -64,7 +64,6 @@ 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/patches/$(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)
DEFCONFIG_FILE := $(DEVICE_NAME)_$(BUILD_TYPE)_defconfig
@@ -80,7 +79,7 @@ ifeq ($(DEVICE_NAME), hispark_phoenix)
else
$(hide) rm -rf $(KERNEL_SRC_TMP_PATH);mkdir -p $(KERNEL_SRC_TMP_PATH);cp -arfL $(KERNEL_SRC_PATH)/* $(KERNEL_SRC_TMP_PATH)/
endif
$(hide) $(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(HDF_PATCH_FILE)
$(hide) $(OHOS_BUILD_HOME)/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh $(OHOS_BUILD_HOME) $(KERNEL_SRC_TMP_PATH) $(KERNEL_PATCH_PATH) $(DEVICE_NAME)
ifeq ($(PRODUCT_PATH), vendor/hisilicon/watchos)
$(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(PRODUCT_PATCH_FILE)