From c58197486ecd8c5f93972e225608e50a3d94e431 Mon Sep 17 00:00:00 2001 From: "libing3@huawei.com" Date: Wed, 27 Apr 2022 17:15:19 +0800 Subject: [PATCH] adapter hispark_phoenix Signed-off-by: libing3@huawei.com Change-Id: I223444c59d73e9ad92aba49625ba33fc57fe752d --- build_kernel.sh | 2 +- kernel.mk | 8 ++++---- kernel_module_build.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_kernel.sh b/build_kernel.sh index 41d1ccc..22097ee 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -28,7 +28,7 @@ rm -rf ${3}/../../../kernel.timestamp # it needs more adaptation if [ "$5" == "arm" ];then cp ${2}/kernel/OBJ/${8}/arch/arm/boot/uImage ${3}/uImage -if [ "$7" == "hi3751v350" ];then +if [ "$7" == "hi3751v350" ] || [ "$7" == "hispark_phoenix" ];then cp ${2}/kernel/OBJ/${8}/arch/arm/boot/dts/hi3751v350.dtb ${3}/dtbo.img cat ${2}/kernel/OBJ/${8}/arch/arm/boot/zImage ${3}/dtbo.img > ${3}/zImage-dtb else diff --git a/kernel.mk b/kernel.mk index 11e916e..536425d 100755 --- a/kernel.mk +++ b/kernel.mk @@ -41,14 +41,14 @@ else ifeq ($(KERNEL_ARCH), arm64) endif KERNEL_CROSS_COMPILE := -ifeq ($(DEVICE_NAME), hi3751v350) +ifneq ($(filter $(DEVICE_NAME),hi3751v350 hispark_phoenix),) KERNEL_CROSS_COMPILE += CONFIG_MSP="y" else KERNEL_CROSS_COMPILE += CC="$(CLANG_CC)" endif KERNEL_CROSS_COMPILE += CROSS_COMPILE="$(KERNEL_TARGET_TOOLCHAIN_PREFIX)" -ifeq ($(DEVICE_NAME), hi3751v350) +ifneq ($(filter $(DEVICE_NAME),hi3751v350 hispark_phoenix),) KERNEL_MAKE := \ PATH="$(BOOT_IMAGE_PATH):$(KERNEL_TARGET_TOOLCHAIN):$$PATH" \ $(KERNEL_PREBUILT_MAKE) @@ -72,7 +72,7 @@ export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH) $(KERNEL_IMAGE_FILE): $(hide) echo "build kernel..." -ifeq ($(DEVICE_NAME), hi3751v350) +ifneq ($(filter $(DEVICE_NAME),hi3751v350 hispark_phoenix),) $(hide) rm -rf $(KERNEL_SRC_TMP_PATH);mkdir -p $(KERNEL_SRC_TMP_PATH);cp -arfP $(KERNEL_SRC_PATH)/* $(KERNEL_SRC_TMP_PATH)/ $(hide) cd $(KERNEL_SRC_TMP_PATH)/drivers && rm -rf common && ln -s $(SDK_SOURCE_DIR)/common/drv ./common && cd - $(hide) cd $(KERNEL_SRC_TMP_PATH)/drivers && rm -rf msp && ln -s $(SDK_SOURCE_DIR)/msp/drv ./msp && cd - @@ -98,7 +98,7 @@ ifeq ($(KERNEL_VERSION), linux-5.10) endif $(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) -j64 $(KERNEL_IMAGE) endif -ifeq ($(DEVICE_NAME), hi3751v350) +ifneq ($(filter $(DEVICE_NAME),hi3751v350 hispark_phoenix),) $(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs endif .PHONY: build-kernel diff --git a/kernel_module_build.sh b/kernel_module_build.sh index 961b31b..0f618d3 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -42,8 +42,8 @@ fi export KERNEL_IMAGE=${kernel_image} LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OBJ_OUT}/arch/${KERNEL_ARCH}/boot/${kernel_image} -if [ "$DEVICE_NAME" == "hi3751v350" ];then -export SDK_SOURCE_DIR=${OHOS_ROOT_PATH}/device/soc/hisilicon/${DEVICE_NAME}/sdk_linux/source +if [ "$DEVICE_NAME" == "hi3751v350" ] || [ "$DEVICE_NAME" == "hispark_phoenix" ];then +export SDK_SOURCE_DIR=${OHOS_ROOT_PATH}/device/soc/hisilicon/hi3751v350/sdk_linux/source fi make -f kernel.mk -- Gitee