On Tue, 4 Dec 2018 11:14:29 +0000
Julien Thierry <julien.thierry@xxxxxxx> wrote:
> 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@xxxxxxx>
Reviewed-by: Andre Przywara <andre.przywara@xxxxxxx>
Thanks,
Andre.
> ---
> arm/fdt.c | 10 ----------
> arm/kvm.c | 10 ++++++++++
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arm/fdt.c b/arm/fdt.c
> index 980015b..664bb62 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 b824f63..c6843e5 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;
> +}
