diff options
| author | Peter Maydell | 2022-08-23 18:04:17 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-09-14 12:19:40 +0200 |
| commit | 761c532ab1ebe9d345c9afe4fb9c2c4b26c58582 (patch) | |
| tree | 8b18095aecbc67978fb1ca9a8355106e6767518c /include/hw | |
| parent | target/arm: Remove useless TARGET_BIG_ENDIAN check in armv7m_load_kernel() (diff) | |
| download | qemu-761c532ab1ebe9d345c9afe4fb9c2c4b26c58582.tar.gz qemu-761c532ab1ebe9d345c9afe4fb9c2c4b26c58582.tar.xz qemu-761c532ab1ebe9d345c9afe4fb9c2c4b26c58582.zip | |
target/arm: Make boards pass base address to armv7m_load_kernel()
Currently armv7m_load_kernel() takes the size of the block of memory
where it should load the initial guest image, but assumes that it
should always load it at address 0. This happens to be true of all
our M-profile boards at the moment, but it isn't guaranteed to always
be so: M-profile CPUs can be configured (via init-svtor and
init-nsvtor, which match equivalent hardware configuration signals)
to have the initial vector table at any address, not just zero. (For
instance the Teeny board has the boot ROM at address 0x0200_0000.)
Add a base address argument to armv7m_load_kernel(), so that
callers now pass in both base address and size. All the current
callers pass 0, so this is not a behaviour change.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220823160417.3858216-3-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/arm/boot.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index c7ebae156e..f18cc3064f 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -25,13 +25,16 @@ typedef enum { * armv7m_load_kernel: * @cpu: CPU * @kernel_filename: file to load + * @mem_base: base address to load image at (should be where the + * CPU expects to find its vector table on reset) * @mem_size: mem_size: maximum image size to load * * Load the guest image for an ARMv7M system. This must be called by * any ARMv7M board. (This is necessary to ensure that the CPU resets * correctly on system reset, as well as for kernel loading.) */ -void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size); +void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, + hwaddr mem_base, int mem_size); /* arm_boot.c */ struct arm_boot_info { |