Am 14.04.2012 18:42, schrieb Peter Maydell: > Move the A9 config_base_address cp15 register reset value to > ARMCPU. This should become a QOM property so that the Highbank > board can set it without having to pull in cpu-qom.h, but at > least this avoids the implicit dependency on reset ordering > that the previous workaround had. > > Cc: Mark Langsdorf <[email protected]> > Signed-off-by: Peter Maydell <[email protected]> > --- > hw/highbank.c | 11 ++++------- > target-arm/cpu-qom.h | 1 + > target-arm/cpu.c | 4 +--- > 3 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/hw/highbank.c b/hw/highbank.c > index 906eed5..9ff639b 100644 > --- a/hw/highbank.c > +++ b/hw/highbank.c [...] > @@ -213,14 +207,17 @@ static void highbank_init(ram_addr_t ram_size, > } > > for (n = 0; n < smp_cpus; n++) { > + ARMCPU *cpu; > env = cpu_init(cpu_model); > if (!env) { > fprintf(stderr, "Unable to find CPU definition\n"); > exit(1); > } > + cpu = arm_env_get_cpu(env);
Ugh, I'd like to avoid this creeping into boards... Would you mind applying the updated 1-13 (they should all have some tag of mine now) and rebasing this one on a patch that I'll send you shortly, changing cpu_arm_init() signature? Otherwise looks okay. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
