diff --git a/BUILD.gn b/BUILD.gn index 08bd5c0fab73dcb6e4422cb39d31b4ff574d9c0b..d99e42fc8587d18c3768ceb7e4bf3193cc2293fe 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 ee391f181b62adb5bcbda6f43dcde76977b2acee..935b64b0a9f7de394f7969e6056cab8dffdbc81e 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 74ac9c8e9bbf41aeda1a51a27ce720336047a158..6e69ce4b4c57469b9ebff2fce567d39448643e62 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -21,6 +21,7 @@ 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 @@ -35,11 +36,18 @@ 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_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 if [ "$DEVICE_NAME" == "hispark_phoenix" ];then export SDK_SOURCE_DIR=${OHOS_ROOT_PATH}/device/soc/hisilicon/hi3751v350/sdk_linux/source @@ -57,5 +65,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