From 3387782dd1995e429ff42cd61b3b560f5a38d1f6 Mon Sep 17 00:00:00 2001 From: ryanzx <26420413@qq.com> Date: Fri, 18 Nov 2022 10:10:00 +0800 Subject: [PATCH 1/3] modify: adapt linux build to mips arch Signed-off-by: ryanzx <26420413@qq.com> --- BUILD.gn | 4 +++- kernel.mk | 7 +++++++ kernel_module_build.sh | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 08bd5c0..d99e42f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -25,7 +25,9 @@ if (target_cpu == "arm") { kernel_image = "uImage" } else if (target_cpu == "arm64") { kernel_image = "Image" -} else if (target_cpu == "x86_64") { +}else if (target_cpu == "mips"){ + kernel_image = "xImage" +}else if (target_cpu == "x86_64") { kernel_image = "bzImage" } diff --git a/kernel.mk b/kernel.mk index ee391f1..935b64b 100644 --- a/kernel.mk +++ b/kernel.mk @@ -39,6 +39,9 @@ ifeq ($(KERNEL_ARCH), arm) else ifeq ($(KERNEL_ARCH), arm64) KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/aarch64/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu/bin KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/aarch64-linux-gnu- +else ifeq ($(KERNEL_ARCH), mips) + KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/mips/mips-gcc720-glibc229/bin + KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/mips-linux-gnu- else ifeq ($(KERNEL_ARCH), x86_64) KERNEL_TARGET_TOOLCHAIN := gcc KERNEL_TARGET_TOOLCHAIN_PREFIX := @@ -65,7 +68,11 @@ DEVICE_PATCH_DIR := $(OHOS_BUILD_HOME)/kernel/linux/patches/${KERNEL_VERSION}/$( DEVICE_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME).patch PRODUCT_PATCH_FILE := $(OHOS_BUILD_HOME)/vendor/hisilicon/watchos/patches/$(DEVICE_NAME).patch SMALL_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME)_$(BUILD_TYPE).patch +ifeq ($(KERNEL_ARCH), mips) +KERNEL_IMAGE_FILE := $(KERNEL_SRC_TMP_PATH)/arch/$(KERNEL_ARCH)/boot/compressed/$(KERNEL_IMAGE) +else KERNEL_IMAGE_FILE := $(KERNEL_SRC_TMP_PATH)/arch/$(KERNEL_ARCH)/boot/$(KERNEL_IMAGE) +endif DEFCONFIG_FILE := $(DEVICE_NAME)_$(BUILD_TYPE)_defconfig export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH) diff --git a/kernel_module_build.sh b/kernel_module_build.sh index 74ac9c8..bcd9b46 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -35,11 +35,17 @@ if [ "$KERNEL_ARCH" == "arm" ];then kernel_image="uImage" elif [ "$KERNEL_ARCH" == "arm64" ];then kernel_image="Image" +elif [ "$KERNEL_ARCH" == "mips" ];then + kernel_image="xImage" elif [ "$KERNEL_ARCH" == "x86_64" ];then kernel_image="bzImage" fi export KERNEL_IMAGE=${kernel_image} +if [ "$KERNEL_ARCH" == "mips" ];then +LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OUT}/arch/${KERNEL_ARCH}/boot/compressed/${kernel_image} +else LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OBJ_OUT}/arch/${KERNEL_ARCH}/boot/${kernel_image} +fi if [ "$DEVICE_NAME" == "hispark_phoenix" ];then export SDK_SOURCE_DIR=${OHOS_ROOT_PATH}/device/soc/hisilicon/hi3751v350/sdk_linux/source @@ -57,5 +63,7 @@ fi if [ "$5" == "hispark_taurus" ];then cp -rf ${LINUX_KERNEL_IMAGE_FILE} ${OUT_DIR}/uImage_${DEVICE_NAME}_smp fi - +if [ "$5" == "x2000" ];then + cp -rf ${LINUX_KERNEL_IMAGE_FILE} ${OUT_DIR}/xImage_${DEVICE_NAME}_smp +fi exit 0 -- Gitee From 1ea85420b7b435ce3833ab72b1c03ef1c0a5d9de Mon Sep 17 00:00:00 2001 From: ryanzx <26420413@qq.com> Date: Fri, 18 Nov 2022 11:09:10 +0800 Subject: [PATCH 2/3] del: debug info Signed-off-by: ryanzx <26420413@qq.com> --- kernel_module_build.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel_module_build.sh b/kernel_module_build.sh index bcd9b46..ac171d8 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -15,12 +15,6 @@ set -e -export OUT_DIR=$1 -export BUILD_TYPE=$2 -export KERNEL_ARCH=$3 -export PRODUCT_PATH=$4 -export DEVICE_NAME=$5 -export KERNEL_VERSION=$6 if [ "$BUILD_TYPE" == "small" ];then LINUX_KERNEL_OUT=${OUT_DIR}/kernel/${KERNEL_VERSION} elif [ "$BUILD_TYPE" == "standard" ];then @@ -40,9 +34,10 @@ elif [ "$KERNEL_ARCH" == "mips" ];then elif [ "$KERNEL_ARCH" == "x86_64" ];then kernel_image="bzImage" fi + export KERNEL_IMAGE=${kernel_image} if [ "$KERNEL_ARCH" == "mips" ];then -LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OUT}/arch/${KERNEL_ARCH}/boot/compressed/${kernel_image} +LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OBJ_OUT}/arch/${KERNEL_ARCH}/boot/compressed/${kernel_image} else LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OBJ_OUT}/arch/${KERNEL_ARCH}/boot/${kernel_image} fi -- Gitee From 2d8e3676311aba539006607ca2f0a865a36bd279 Mon Sep 17 00:00:00 2001 From: ryanzx <26420413@qq.com> Date: Mon, 21 Nov 2022 11:03:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=AF=AF=E5=88=A0export?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ryanzx <26420413@qq.com> --- kernel_module_build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel_module_build.sh b/kernel_module_build.sh index ac171d8..6e69ce4 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -15,6 +15,13 @@ set -e +export OUT_DIR=$1 +export BUILD_TYPE=$2 +export KERNEL_ARCH=$3 +export PRODUCT_PATH=$4 +export DEVICE_NAME=$5 +export KERNEL_VERSION=$6 + if [ "$BUILD_TYPE" == "small" ];then LINUX_KERNEL_OUT=${OUT_DIR}/kernel/${KERNEL_VERSION} elif [ "$BUILD_TYPE" == "standard" ];then -- Gitee