diff --git a/build_kernel.sh b/build_kernel.sh index 535d2ddf7529e240d6e217b561dc1a0d727f5b92..26797439c6db96cb32d0c131b1d05643c880a1d7 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -37,5 +37,9 @@ fi elif [ "$5" == "arm64" ];then cp ${2}/kernel/OBJ/${8}/arch/arm64/boot/Image ${3}/Image + +elif [ "$5" == "x86_64" ];then + cp ${2}/kernel/OBJ/${8}/arch/x86/boot/bzImage ${3}/bzImage fi + popd diff --git a/kernel.mk b/kernel.mk index f088716e4babadc6176d7297e1bebb2bf7df68ce..dc3343b5565c27555c3beaedcc4a99de9b641b5f 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), x86_64) + KERNEL_TARGET_TOOLCHAIN := gcc + KERNEL_TARGET_TOOLCHAIN_PREFIX := endif KERNEL_CROSS_COMPILE := @@ -47,7 +50,10 @@ KERNEL_CROSS_COMPILE += CONFIG_MSP="y" endif KERNEL_CROSS_COMPILE += CC="$(CLANG_CC)" + +ifneq ($(KERNEL_ARCH), x86_64) KERNEL_CROSS_COMPILE += CROSS_COMPILE="$(KERNEL_TARGET_TOOLCHAIN_PREFIX)" +endif KERNEL_MAKE := \ PATH="$(BOOT_IMAGE_PATH):$$PATH" \ diff --git a/kernel_module_build.sh b/kernel_module_build.sh index f602c46675b977d6f9a0884386d42a45c5311094..74ac9c8e9bbf41aeda1a51a27ce720336047a158 100755 --- a/kernel_module_build.sh +++ b/kernel_module_build.sh @@ -35,6 +35,8 @@ if [ "$KERNEL_ARCH" == "arm" ];then kernel_image="uImage" elif [ "$KERNEL_ARCH" == "arm64" ];then kernel_image="Image" +elif [ "$KERNEL_ARCH" == "x86_64" ];then + kernel_image="bzImage" fi export KERNEL_IMAGE=${kernel_image} LINUX_KERNEL_IMAGE_FILE=${LINUX_KERNEL_OBJ_OUT}/arch/${KERNEL_ARCH}/boot/${kernel_image}