[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/36] hw/arm: Load -bios image as a boot ROM for npcm7xx
From: |
Peter Maydell |
Subject: |
[PULL 25/36] hw/arm: Load -bios image as a boot ROM for npcm7xx |
Date: |
Mon, 14 Sep 2020 15:06:30 +0100 |
From: Havard Skinnemoen <hskinnemoen@google.com>
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>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
Message-id: 20200911052101.2602693-8-hskinnemoen@google.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/npcm7xx_boards.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index 939391c3a3c..b4c772d6b52 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -19,12 +19,42 @@
#include "exec/address-spaces.h"
#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(MachineState *machine, NPCM7xxState *soc)
+{
+ g_autofree char *filename = NULL;
+ int ret;
+
+ if (!bios_name) {
+ bios_name = npcm7xx_default_bootrom;
+ }
+
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+ if (!filename) {
+ error_report("Could not find ROM image '%s'", bios_name);
+ if (!machine->kernel_filename) {
+ /* We can't boot without a bootrom or a kernel image. */
+ exit(1);
+ }
+ return;
+ }
+ 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);
@@ -61,6 +91,7 @@ static void npcm750_evb_init(MachineState *machine)
npcm7xx_connect_dram(soc, machine->ram);
qdev_realize(DEVICE(soc), NULL, &error_fatal);
+ npcm7xx_load_bootrom(machine, soc);
npcm7xx_load_kernel(machine, soc);
}
@@ -72,6 +103,7 @@ static void quanta_gsj_init(MachineState *machine)
npcm7xx_connect_dram(soc, machine->ram);
qdev_realize(DEVICE(soc), NULL, &error_fatal);
+ npcm7xx_load_bootrom(machine, soc);
npcm7xx_load_kernel(machine, soc);
}
--
2.20.1
- [PULL 13/36] hw/arm/mps2: New board model mps2-an500, (continued)
- [PULL 13/36] hw/arm/mps2: New board model mps2-an500, Peter Maydell, 2020/09/14
- [PULL 14/36] docs/system/arm/mps2.rst: Make board list consistent, Peter Maydell, 2020/09/14
- [PULL 15/36] Deprecate Unicore32 port, Peter Maydell, 2020/09/14
- [PULL 16/36] Deprecate lm32 port, Peter Maydell, 2020/09/14
- [PULL 17/36] target/arm: Count PMU events when MDCR.SPME is set, Peter Maydell, 2020/09/14
- [PULL 18/36] hw/arm: versal-virt: Correct the tx/rx GEM clocks, Peter Maydell, 2020/09/14
- [PULL 19/36] hw/misc: Add NPCM7xx System Global Control Registers device model, Peter Maydell, 2020/09/14
- [PULL 20/36] hw/misc: Add NPCM7xx Clock Controller device model, Peter Maydell, 2020/09/14
- [PULL 21/36] hw/timer: Add NPCM7xx Timer device model, Peter Maydell, 2020/09/14
- [PULL 22/36] hw/arm: Add NPCM730 and NPCM750 SoC models, Peter Maydell, 2020/09/14
- [PULL 25/36] hw/arm: Load -bios image as a boot ROM for npcm7xx,
Peter Maydell <=
- [PULL 24/36] roms: Add virtual Boot ROM for NPCM7xx SoCs, Peter Maydell, 2020/09/14
- [PULL 23/36] hw/arm: Add two NPCM7xx-based machines, Peter Maydell, 2020/09/14
- [PULL 27/36] hw/mem: Stubbed out NPCM7xx Memory Controller model, Peter Maydell, 2020/09/14
- [PULL 29/36] hw/arm: Wire up BMC boot flash for npcm750-evb and quanta-gsj, Peter Maydell, 2020/09/14
- [PULL 26/36] hw/nvram: NPCM7xx OTP device model, Peter Maydell, 2020/09/14
- [PULL 30/36] hw/arm/npcm7xx: add board setup stub for CPU and UART clocks, Peter Maydell, 2020/09/14
- [PULL 28/36] hw/ssi: NPCM7xx Flash Interface Unit device model, Peter Maydell, 2020/09/14
- [PULL 31/36] docs/system: Add Nuvoton machine documentation, Peter Maydell, 2020/09/14
- [PULL 32/36] tests/acceptance: console boot tests for quanta-gsj, Peter Maydell, 2020/09/14