From f35a885c485cb6b87850e6447292394ece24cd93 Mon Sep 17 00:00:00 2001
From: Zachery Wu <zzzuo_shu@163.com>
Date: Thu, 17 Jun 2021 22:37:39 +0800
Subject: [PATCH] fix L1 build

Signed-off-by: Zachery Wu <zzzuo_shu@163.com>
Change-Id: I4827e0fb42ba800e3b244ce61694bb3880e61187
---
 kernel.mk              | 15 +++++++++++++--
 kernel_module_build.sh |  6 ++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/kernel.mk b/kernel.mk
index de96511..ca38ac7 100755
--- a/kernel.mk
+++ b/kernel.mk
@@ -15,7 +15,7 @@
 # ohos makefile to build kernel
 PRODUCT_NAME=$(TARGET_PRODUCT)
 OHOS_BUILD_HOME := $(realpath $(shell pwd)/../../../)
-KERNEL_SRC_TMP_PATH := $(OUT_DIR)/kernel/src_tmp/linux-4.19
+KERNEL_SRC_TMP_PATH := $(OUT_DIR)/kernel/linux-4.19
 ifeq ($(PRODUCT_NAME), Hi3516DV300)
     OHOS_BUILD_HOME := $(OHOS_ROOT_PATH)
     BOOT_IMAGE_PATH = $(OHOS_BUILD_HOME)/device/hisilicon/hispark_taurus/prebuilts
@@ -58,13 +58,24 @@ KERNEL_MAKE := \
     $(KERNEL_PREBUILT_MAKE)
 
 ifeq ($(PRODUCT_NAME), Hi3516DV300)
+HI3516DV300_PATCH_DIR := $(OHOS_BUILD_HOME)/kernel/linux/patches/linux-4.19/hi3516dv300_small_patch
+HI3516DV300_PATCH_FILE := $(HI3516DV300_PATCH_DIR)/hi3516dv300_small.patch
 HI3516DV300_PATCH_FILE := $(OHOS_BUILD_HOME)/device/hisilicon/hi3516dv300/sdk_linux/open_source/linux/hisi_linux-4.19_hos_l2.patch
+HDF_PATCH_FILE := $(HI3516DV300_PATCH_DIR)/hdf.patch
+DFX_PATCH_FILE := $(HI3516DV300_PATCH_DIR)/dfx.patch
 KERNEL_IMAGE_FILE := $(KERNEL_SRC_TMP_PATH)/arch/arm/boot/uImage
+export HDF_PROJECT_ROOT=$(OHOS_BUILD_HOME)/
+export PRODUCT_PATH=vendor/hisilicon/hispark_taurus_linux
 
 $(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) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(HI3516DV300_PATCH_FILE)
+
+	$(hide) pushd $(KERNEL_SRC_TMP_PATH); \
+		# patch -p1 < $(DFX_PATCH_FILE);patch -p1 < $(HDF_PATCH_FILE); \
+		patch -p1 < $(HI3516DV300_PATCH_FILE); \
+		popd
+	$(hide) cp -rf $(KERNEL_CONFIG_PATH)/. $(KERNEL_SRC_TMP_PATH)/
 	$(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) distclean
 	$(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) hi3516dv300_emmc_smp_hos_l2_defconfig
 	$(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) -j64 uImage
diff --git a/kernel_module_build.sh b/kernel_module_build.sh
index 179eeda..5d5d246 100755
--- a/kernel_module_build.sh
+++ b/kernel_module_build.sh
@@ -18,15 +18,16 @@ set -e
 
 if [ $2 == "hispark_taurus" ];then
     export TARGET_PRODUCT=hi3516dv300
+    LINUX_KERNEL_OUT=${OUT_DIR}/kernel/linux-4.19
 elif [ $2 == "Hi3516DV300" ];then
     export TARGET_PRODUCT=Hi3516DV300
+    LINUX_KERNEL_OUT=${OUT_DIR}/kernel/src_tmp/linux-4.19
 fi
 
 export OHOS_ROOT_PATH=$(pwd)/../../..
 #note out_dir style:out/xx/
 export OUT_DIR=$1
 
-LINUX_KERNEL_OUT=${OUT_DIR}/kernel/src_tmp/linux-4.19
 LINUX_KERNEL_UIMAGE_FILE=${LINUX_KERNEL_OUT}/arch/arm/boot/uImage
 
 HISPARK_TAS_SDK_LINUX_PATH=${OHOS_ROOT_PATH}/device/hisilicon/hispark_taurus/sdk_linux
@@ -46,7 +47,4 @@ if [ $2 == "hispark_taurus" ];then
     cp -rf ${LINUX_KERNEL_UIMAGE_FILE} ${OUT_DIR}/uImage_hi3516dv300_smp
 fi
 
-export KERNEL_ROOT=${LINUX_KERNEL_OUT}
-pushd ${HISPARK_TAS_SDK_LINUX_MPP_PATH}; make -f sdk.mk; popd
-
 exit 0
-- 
Gitee