@@ -21,7 +21,7 @@ pretty_print_stacks=yes
environ_default=yes
u32_long=
wa_divide=
-vmm="qemu"
+target=
errata_force=0
erratatxt="$srcdir/errata.txt"
host_key_document=
@@ -35,8 +35,8 @@ usage() {
Options include:
--arch=ARCH architecture to compile for ($arch)
--processor=PROCESSOR processor to compile for ($arch)
- --vmm=VMM virtual machine monitor to compile for (qemu
- or kvmtool, default is qemu) (arm/arm64 only)
+ --target=TARGET target platform that the tests will be running on (qemu or
+ kvmtool, default is qemu) (arm/arm64 only)
--cross-prefix=PREFIX cross compiler prefix
--cc=CC c compiler to use ($cc)
--ld=LD ld linker to use ($ld)
@@ -58,7 +58,7 @@ usage() {
--earlycon=EARLYCON
Specify the UART name, type and address (optional, arm and
arm64 only). The specified address will overwrite the UART
- address set by the --vmm option. EARLYCON can be one of
+ address set by the --target option. EARLYCON can be one of
(case sensitive):
uart[8250],mmio,ADDR
Specify an 8250 compatible UART at address ADDR. Supported
@@ -88,8 +88,8 @@ while [[ "$1" = -* ]]; do
--processor)
processor="$arg"
;;
- --vmm)
- vmm="$arg"
+ --target)
+ target="$arg"
;;
--cross-prefix)
cross_prefix="$arg"
@@ -146,6 +146,15 @@ arch_name=$arch
[ "$arch" = "aarch64" ] && arch="arm64"
[ "$arch_name" = "arm64" ] && arch_name="aarch64"
+if [ -z "$target" ]; then
+ target="qemu"
+else
+ if [ "$arch" != "arm64" ] && [ "$arch" != "arm" ]; then
+ echo "--target is not supported for $arch"
+ usage
+ fi
+fi
+
if [ -z "$page_size" ]; then
[ "$arch" = "arm64" ] && page_size="65536"
[ "$arch" = "arm" ] && page_size="4096"
@@ -177,13 +186,13 @@ if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then
testdir=x86
elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
testdir=arm
- if [ "$vmm" = "qemu" ]; then
+ if [ "$target" = "qemu" ]; then
arm_uart_early_addr=0x09000000
- elif [ "$vmm" = "kvmtool" ]; then
+ elif [ "$target" = "kvmtool" ]; then
arm_uart_early_addr=0x3f8
errata_force=1
else
- echo '--vmm must be one of "qemu" or "kvmtool"!'
+ echo "--target must be one of 'qemu' or 'kvmtool'!"
usage
fi
@@ -318,6 +327,9 @@ WA_DIVIDE=$wa_divide
GENPROTIMG=${GENPROTIMG-genprotimg}
HOST_KEY_DOCUMENT=$host_key_document
EOF
+if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
+ echo "TARGET=$target" >> config.mak
+fi
cat <<EOF > lib/config.h
#ifndef CONFIG_H