qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v1 1/1] target_arm: Make the reset rom_ptr a property
@ 2014-08-21  1:36 Alistair Francis
  2014-08-21  1:40 ` Alistair Francis
  2014-08-21  8:01 ` Peter Maydell
  0 siblings, 2 replies; 20+ messages in thread
From: Alistair Francis @ 2014-08-21  1:36 UTC (permalink / raw)
  To: qemu-devel; +Cc: peter.crosthwaite

This allows the board to set the reset address, which is required
for some boards (the Netduino Plus 2 for example)

Signed-off-by: Alistair Francis <alistair23@gmail.com>
---
At the moment nothing requires this change, but I have a machine
model that I'm working on that requires this

Thanks to Peter C for spotting this issue

 target-arm/cpu-qom.h | 1 +
 target-arm/cpu.c     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
index 07f3c9e..7e415f5 100644
--- a/target-arm/cpu-qom.h
+++ b/target-arm/cpu-qom.h
@@ -138,6 +138,7 @@ typedef struct ARMCPU {
     uint32_t id_isar3;
     uint32_t id_isar4;
     uint32_t id_isar5;
+    uint32_t rom_address;
     uint64_t id_aa64pfr0;
     uint64_t id_aa64pfr1;
     uint64_t id_aa64dfr0;
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 8199f32..29f9473 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -134,7 +134,7 @@ static void arm_cpu_reset(CPUState *s)
         uint32_t pc;
         uint8_t *rom;
         env->daif &= ~PSTATE_I;
-        rom = rom_ptr(0);
+        rom = rom_ptr(cpu->rom_address);
         if (rom) {
             /* We should really use ldl_phys here, in case the guest
                modified flash and reset itself.  However images
@@ -1020,6 +1020,7 @@ static const ARMCPUInfo arm_cpus[] = {
 static Property arm_cpu_properties[] = {
     DEFINE_PROP_BOOL("start-powered-off", ARMCPU, start_powered_off, false),
     DEFINE_PROP_UINT32("midr", ARMCPU, midr, 0),
+    DEFINE_PROP_UINT32("rom-address", ARMCPU, rom_address, 0),
     DEFINE_PROP_END_OF_LIST()
 };
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2014-08-21 13:19 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-21  1:36 [Qemu-devel] [PATCH v1 1/1] target_arm: Make the reset rom_ptr a property Alistair Francis
2014-08-21  1:40 ` Alistair Francis
2014-08-21  3:37   ` Peter Crosthwaite
2014-08-21  4:13     ` Alistair Francis
2014-08-21 10:55     ` Andreas Färber
2014-08-21 12:33     ` Peter Maydell
2014-08-21 12:37       ` Peter Crosthwaite
2014-08-21 12:40         ` Peter Maydell
2014-08-21 12:43           ` Peter Crosthwaite
2014-08-21 13:15       ` Christopher Covington
2014-08-21 13:18         ` Peter Maydell
2014-08-21  8:01 ` Peter Maydell
2014-08-21  8:35   ` Alistair Francis
2014-08-21  9:14     ` Peter Maydell
2014-08-21 12:09       ` Alistair Francis
2014-08-21 12:22         ` Peter Crosthwaite
2014-08-21 12:26           ` Alistair Francis
2014-08-21 12:24         ` Peter Maydell
2014-08-21 12:35           ` Peter Crosthwaite
2014-08-21 12:37           ` Alistair Francis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).