On 7/17/20 8:02 AM, Havard Skinnemoen wrote:
> If a -bios option is specified on the command line, load the image into
> the internal ROM memory region, which contains the first instructions
> run by the CPU after reset.
>
> If -bios is not specified, the vbootrom included with qemu is loaded by
> default.
>
> Reviewed-by: Tyrone Ting <kfting@nuvoton.com>
> Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
> ---
> hw/arm/npcm7xx_boards.c | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
>
> diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
> index 0b9dce2b35..f32557e0e1 100644
> --- a/hw/arm/npcm7xx_boards.c
> +++ b/hw/arm/npcm7xx_boards.c
> @@ -18,12 +18,41 @@
>
> #include "hw/arm/npcm7xx.h"
> #include "hw/core/cpu.h"
> +#include "hw/loader.h"
> #include "qapi/error.h"
> +#include "qemu-common.h"
> #include "qemu/units.h"
> +#include "sysemu/sysemu.h"
>
> #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7
> #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff
>
> +static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin";
> +
> +static void npcm7xx_load_bootrom(NPCM7xxState *soc)
> +{
> + g_autofree char *filename = NULL;
> + const char *bootrom;
> + int ret;
> +
> + if (bios_name) {
> + bootrom = bios_name;
> + } else {
> + bootrom = npcm7xx_default_bootrom;
you could simply assign bios_name. No need to resend for that.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
C.
> + }
> +
> + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bootrom);
> + if (!filename) {
> + error_report("Could not find ROM image '%s'", bootrom);
> + exit(1);
> + }
> + ret = load_image_mr(filename, &soc->irom);
> + if (ret < 0) {
> + error_report("Failed to load ROM image '%s'", filename);
> + exit(1);
> + }
> +}
> +
> static void npcm7xx_connect_dram(NPCM7xxState *soc, MemoryRegion *dram)
> {
> memory_region_add_subregion(get_system_memory(), NPCM7XX_DRAM_BA, dram);
> @@ -60,6 +89,7 @@ static void npcm750_evb_init(MachineState *machine)
> npcm7xx_connect_dram(soc, machine->ram);
> qdev_realize(DEVICE(soc), NULL, &error_fatal);
>
> + npcm7xx_load_bootrom(soc);
> npcm7xx_load_kernel(machine, soc);
> }
>
> @@ -71,6 +101,7 @@ static void quanta_gsj_init(MachineState *machine)
> npcm7xx_connect_dram(soc, machine->ram);
> qdev_realize(DEVICE(soc), NULL, &error_fatal);
>
> + npcm7xx_load_bootrom(soc);
> npcm7xx_load_kernel(machine, soc);
> }
>
>