From: Michalis Pappas <michalis@unikraft.io>
Date: Thu, 10 Aug 2023 07:42:40 +0000 (+0200)
Subject: plat/kvm: Update entry point for LXBOOT on arm64
X-Git-Tag: RELEASE-0.14.0~35
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=893ae5741522bdabbfaa08bd89597009345e7da0;p=unikraft%2Funikraft.git

plat/kvm: Update entry point for LXBOOT on arm64

Update Linker.uk to use the same entry point for both QEMU_VIRT and
LXBOOT protocols.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #988
---

diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
index fa58cab63..97c2413c4 100644
--- a/plat/kvm/Linker.uk
+++ b/plat/kvm/Linker.uk
@@ -10,12 +10,12 @@ KVM_LDFLAGS-y += -Wl,--entry=uk_efi_entry64
 KVM_LDFLAGS-y += -Wl,-m,elf_x86_64
 endif
 else ifeq (arm64,$(CONFIG_UK_ARCH))
-ifeq ($(CONFIG_KVM_BOOT_PROTOCOL_QEMU_VIRT),y)
-KVM_LDFLAGS-y += -Wl,--entry=_libkvmplat_entry
+ifeq ($(CONFIG_KVM_BOOT_PROTO_EFI_STUB),y)
+KVM_LDFLAGS-y += -Wl,--entry=uk_efi_entry64
 KVM_LDFLAGS-y += -Wl,-m,aarch64elf
 KVM_LINK_LIBGCC_FLAG := -lgcc
-else ifeq ($(CONFIG_KVM_BOOT_PROTO_EFI_STUB),y)
-KVM_LDFLAGS-y += -Wl,--entry=uk_efi_entry64
+else
+KVM_LDFLAGS-y += -Wl,--entry=_libkvmplat_entry
 KVM_LDFLAGS-y += -Wl,-m,aarch64elf
 KVM_LINK_LIBGCC_FLAG := -lgcc
 endif