]> xenbits.xensource.com Git - unikraft/unikraft.git/commitdiff
plat/kvm: Update entry point for LXBOOT on arm64
authorMichalis Pappas <michalis@unikraft.io>
Thu, 10 Aug 2023 07:42:40 +0000 (09:42 +0200)
committerUnikraft <monkey@unikraft.io>
Fri, 11 Aug 2023 19:49:38 +0000 (19:49 +0000)
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

plat/kvm/Linker.uk

index fa58cab638762d4067882c7f1c79487fdea77132..97c2413c49a8eee35b98a212e2f4b91c01b8cee9 100644 (file)
@@ -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