plat/kvm/arm: Move image definitions to init.h

In anticipation of additional platforms and boot protocols
on arm64 move image definitions to a new header.

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/arm/link64.lds.S b/plat/kvm/arm/link64.lds.S
index 07180eebf8222ebea2e8dd4bb666f042774367cf..4cdf90ca30b28e17656533657055cb88dc7ed107 100644 (file)
--- a/plat/kvm/arm/link64.lds.S
+++ b/plat/kvm/arm/link64.lds.S
@@ -32,11 +32,7 @@
 #include <uk/arch/limits.h>
 #include <uk/plat/common/common.lds.h>
 
-/* QEMU-AArch64 virt platform's ram base address */
-#define RAM_BASE_ADDR 0x40000000
-
-/* Reserve first 1MB for DTB */
-#define DTB_RESERVED_SIZE 0x100000
+#include <kvm-arm64/image.h>
 
 OUTPUT_FORMAT("elf64-littleaarch64")
 OUTPUT_ARCH(aarch64)

diff --git a/plat/kvm/include/kvm-arm64/image.h b/plat/kvm/include/kvm-arm64/image.h
new file mode 100644 (file)
index 0000000..16f434d
--- /dev/null
+++ b/plat/kvm/include/kvm-arm64/image.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/* Copyright (c) 2023, Unikraft GmbH and The Unikraft Authors.
+ * Licensed under the BSD-3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ */
+#ifndef __KVM_ARM64_IMAGE_H__
+#define __KVM_ARM64_IMAGE_H__
+
+#define RAM_BASE_ADDR 0x40000000
+
+#define DTB_RESERVED_SIZE 0x100000
+
+#endif /*  __KVM_ARM64_IMAGE_H__ */