aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Thierry <julien.thierry@arm.com>2019-01-10 14:20:42 +0000
committerWill Deacon <will.deacon@arm.com>2019-01-22 06:55:22 +0000
commitf269c81dff7d4fe4b3c867e896169fb405c8084d (patch)
tree8024ff32854f00d4e4197566fa5ef66a3be5e885
parent473c5b295e427a3ac4d92266193096321eb9fe2a (diff)
downloadkvmtool-f269c81dff7d4fe4b3c867e896169fb405c8084d.tar.gz
arm: Move firmware function
Firmware loading/setup function are in fdt file while it is not very related to this. Move them to the file that does the main init/setup for memory. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--arm/fdt.c10
-rw-r--r--arm/kvm.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/arm/fdt.c b/arm/fdt.c
index 980015b4..664bb62e 100644
--- a/arm/fdt.c
+++ b/arm/fdt.c
@@ -14,16 +14,6 @@
#include <linux/sizes.h>
#include <linux/psci.h>
-bool kvm__load_firmware(struct kvm *kvm, const char *firmware_filename)
-{
- return false;
-}
-
-int kvm__arch_setup_firmware(struct kvm *kvm)
-{
- return 0;
-}
-
static void dump_fdt(const char *dtb_file, void *fdt)
{
int count, fd;
diff --git a/arm/kvm.c b/arm/kvm.c
index b824f637..c6843e56 100644
--- a/arm/kvm.c
+++ b/arm/kvm.c
@@ -168,3 +168,13 @@ bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd,
return true;
}
+
+bool kvm__load_firmware(struct kvm *kvm, const char *firmware_filename)
+{
+ return false;
+}
+
+int kvm__arch_setup_firmware(struct kvm *kvm)
+{
+ return 0;
+}