Commit 5132f6ea authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.1-rc3' into staging 



RISC-V Patch for 4.1-rc3

This contains a single patch that fixes the warning introduced as part
of the OpenSBI integration.

# gpg: Signature made Sat 27 Jul 2019 00:04:19 BST
# gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
# gpg:                issuer "palmer@dabbelt.com"
# gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [unknown]
# gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 00CE 76D1 8349 60DF CE88  6DF8 EF4C A150 2CCB AB41

* remotes/palmer/tags/riscv-for-master-4.1-rc3:
  riscv/boot: Fixup the RISC-V firmware warning

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0c6f3e94 75ea2529

hw/riscv/boot.c

+8 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hw/riscv/boot.h"

#include "hw/boards.h"

#include "elf.h"

#include "sysemu/qtest.h"



#if defined(TARGET_RISCV32)

# define KERNEL_BOOT_ADDRESS 0x80400000
@@ -46,10 +47,13 @@ void riscv_find_and_load_firmware(MachineState *machine, 
         * In the future this defaul will change to loading the prebuilt

         * OpenSBI firmware. Let's warn the user and then continue.

        */

        if (!qtest_enabled()) {

            warn_report("No -bios option specified. Not loading a firmware.");

        warn_report("This default will change in QEMU 4.3. Please use the " \

                    "-bios option to aviod breakages when this happens.");

        warn_report("See QEMU's deprecation documentation for details");

            warn_report("This default will change in a future QEMU release. " \

                        "Please use the -bios option to avoid breakages when "\

                        "this happens.");

            warn_report("See QEMU's deprecation documentation for details.");

        }

        return;

    }