Revert "qemuboot, xen-image-minimal: enable runqemu for qemuarm Xen images"

This reverts commit 1c746a976830ebaf85c7c8c25612bea349b0a7c5.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 5 insertions, 21 deletions

diff --git a/classes/qemuboot-xen-defaults.bbclass b/classes/qemuboot-xen-defaults.bbclass
index 62bbf8fd..c7e74c3e 100644
--- a/classes/qemuboot-xen-defaults.bbclass
+++ b/classes/qemuboot-xen-defaults.bbclass
@@ -10,37 +10,21 @@ DOM0_KERNEL ??= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}"
 DOM0_KERNEL_LOAD_ADDR ??= "0x45000000"
 QB_XEN_DOMAIN_MODULES ??= "${DOM0_KERNEL}:${DOM0_KERNEL_LOAD_ADDR}:multiboot,kernel"
 
-# Qemuboot for 32-bit Arm loads Xen via device loader parameter rather than
-# kernel and boots using u-boot as bios
-XEN_BINARY ??= "${DEPLOY_DIR_IMAGE}/xen-${MACHINE}"
-QB_XEN_LOAD_ADDR ??= "0x46000000"
-QB_OPT_APPEND:append:qemuarm = " \
-    -device loader,file=${XEN_BINARY},addr=${QB_XEN_LOAD_ADDR},force-raw=on \
-    -device loader,file=${DOM0_KERNEL},addr=${DOM0_KERNEL_LOAD_ADDR} \
-    -bios ${DEPLOY_DIR_IMAGE}/u-boot.bin \
-    "
-QB_DEFAULT_KERNEL:qemuarm = "none"
-
 # Qemuboot for 64-bit Arm uses the QB_DEFAULT_KERNEL method to load Xen
 # and the device loader option for the dom0 kernel:
-QB_OPT_APPEND:append:qemuarm64 = " \
+QB_OPT_APPEND:append:aarch64 = " \
     -device loader,file=${DOM0_KERNEL},addr=${DOM0_KERNEL_LOAD_ADDR} \
     "
-QB_DEFAULT_KERNEL:qemuarm64 = "xen-${MACHINE}"
+QB_DEFAULT_KERNEL:aarch64 = "xen-${MACHINE}"
 
-# 32-bit Arm: gic version 2
-QB_MACHINE:qemuarm = "-machine virt -machine virtualization=true"
 # 64-bit Arm: gic version 3
-QB_MACHINE:qemuarm64 = "-machine virt,gic-version=3 -machine virtualization=true"
+QB_MACHINE:aarch64 = "-machine virt,gic-version=3 -machine virtualization=true"
 
 # Increase the default qemu memory allocation to allow for the hypervisor.
 # Use a weak assignment to allow for change of default and override elsewhere.
 QB_MEM_VALUE ??= "512"
 QB_MEM = "-m ${QB_MEM_VALUE}"
 
-# 32-bit Arm: qemuboot with a u-boot script image
-QB_XEN_U_BOOT_SCR:qemuarm = "boot.scr.uimg"
-
 # 64-bit Arm: qemuboot with a device tree binary
-QB_DTB:qemuarm64 = "${IMAGE_NAME}.qemuboot.dtb"
-QB_DTB_LINK:qemuarm64 = "${IMAGE_LINK_NAME}.qemuboot.dtb"
+QB_DTB:aarch64 = "${IMAGE_NAME}.qemuboot.dtb"
+QB_DTB_LINK:aarch64 = "${IMAGE_LINK_NAME}.qemuboot.dtb"