Synchronize kernel arch name with Chromium OS
CrOS uses x86_64 as an architecture name for x86 target, do the
same in the deven container to keep things in sync.
Change-Id: I4a5dcbd78602f6ce159898e8f7e956270f53cbc9
Reviewed-on: https://cos-review.googlesource.com/c/cos/tools/+/28600
Reviewed-by: Meena Shanmugam <meenashanmugam@google.com>
Tested-by: Oleksandr Tymoshenko <ovt@google.com>
Cloud-Build: GCB Service account <228075978874@cloudbuild.gserviceaccount.com>
diff --git a/src/cmd/cos_kernel_devenv/README.md b/src/cmd/cos_kernel_devenv/README.md
index 498ee71..01df10b 100644
--- a/src/cmd/cos_kernel_devenv/README.md
+++ b/src/cmd/cos_kernel_devenv/README.md
@@ -87,13 +87,13 @@
available command-line options:
```
-Usage: /devenv.sh [-k | -m | -i] [-Hcd] [-A <x86|arm64>]
+Usage: /devenv.sh [-k | -m | -i] [-Hcd] [-A <x86_64|arm64>]
[-C <kernelconfig>] [-O <objdir>]
[-B <build> -b <board> | -R <release> | -G <bucket>]
[-t <toolchain_version>] [VAR=value ...] [target ...]
Options:
- -A <arch> target architecture. Valid values are x86 and arm64.
+ -A <arch> target architecture. Valid values are x86_64 and arm64.
-B <build> seed the toolchain from the COS build <build>.
Example: R93-16623.0.0. Instead of the actual
build number developer can specify the branch name
@@ -150,9 +150,9 @@
cos_kmake bzImage modules
```
-`cos-kernel-devenv` supports two target arcitectgures: `x86` and `arm64` that
+`cos-kernel-devenv` supports two target arcitectgures: `x86_64` and `arm64` that
can be set for an invocation by passing `-A <arch>` argument to the command.
-Unless specified the `x86` target is the default one.
+Unless specified the `x86_64` target is the default one.
To build ARM64 kernel and modules you can use the following sequence of commands:
@@ -162,7 +162,7 @@
cos_kmake -A arm64 Image modules
```
-All examples below build binaries for `x86` architecture but can be converted to
+All examples below build binaries for `x86_64` architecture but can be converted to
`arm64` by adding `-A arm64` command-line switch.
#### Building Kernel Packages
diff --git a/src/cmd/cos_kernel_devenv/devenv.sh b/src/cmd/cos_kernel_devenv/devenv.sh
index 1205d48..ab173c0 100755
--- a/src/cmd/cos_kernel_devenv/devenv.sh
+++ b/src/cmd/cos_kernel_devenv/devenv.sh
@@ -34,7 +34,7 @@
# Can be overridden by the command-line argument
TOOLCHAIN_ARCH="x86_64"
-KERNEL_ARCH="x86"
+KERNEL_ARCH="x86_64"
# CC and CXX will be set by set_compilation_env
CC=""
@@ -359,7 +359,7 @@
local image_target
case "${KERNEL_ARCH}" in
- x86) image_target="bzImage" ;;
+ x86_64) image_target="bzImage" ;;
arm64) image_target="Image" ;;
*)
echo "Unknown kernel architecture: ${KERNEL_ARCH}"
@@ -416,13 +416,13 @@
usage() {
cat 1>&2 <<__EOUSAGE__
-Usage: $0 [-k | -m | -i] [-cdH] [-A <x86|arm64>]
+Usage: $0 [-k | -m | -i] [-cdH] [-A <x86_64|arm64>]
[-C <kernelconfig>] [-O <objdir>]
[-B <build> -b <board> | -R <release> | -G <bucket>]
[-t <toolchain_version>] [VAR=value ...] [target ...]
Options:
- -A <arch> target architecture. Valid values are x86 and arm64.
+ -A <arch> target architecture. Valid values are x86_64 and arm64.
-B <build> seed the toolchain from the COS build <build>.
Example: R93-16623.0.0. Instead of the actual
build number developer can specify the branch name
@@ -488,12 +488,12 @@
if [[ ! -z "${BOARD}" ]]; then
case "${BOARD}" in
lakitu-arm64) KERNEL_ARCH=arm64 ;;
- *) KERNEL_ARCH=x86 ;;
+ *) KERNEL_ARCH=x86_64 ;;
esac
fi
case "${KERNEL_ARCH}" in
- x86)
+ x86_64)
TOOLCHAIN_ARCH=x86_64
;;
arm64)
