From 96f0d7851ce9d25892a8d2ac0eb013eafe3f0c98 Mon Sep 17 00:00:00 2001
From: Wang Xing <raymond.wangxing@huawei.com>
Date: Mon, 12 Sep 2022 11:45:20 +0800
Subject: [PATCH] Add x86_64 kernel build

Change-Id: I9b4d07014597dff6a9f95a522bbe78658832ea81
Signed-off-by: Wang Xing <raymond.wangxing@huawei.com>
---
 build_kernel.sh        | 4 ++++
 kernel.mk              | 6 ++++++
 kernel_module_build.sh | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/build_kernel.sh b/build_kernel.sh
index 535d2dd..2679743 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 f088716..dc3343b 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 f602c46..74ac9c8 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}
-- 
Gitee