On 8/23/19 6:58 AM, Philippe Mathieu-Daudé wrote: > @@ -2544,7 +2546,6 @@ static const ARMCPUInfo arm_cpus[] = { > { .name = "arm1176", .initfn = arm1176_initfn }, > { .name = "arm11mpcore", .initfn = arm11mpcore_initfn }, > { .name = "cortex-m0", .initfn = cortex_m0_initfn, > -#endif > .class_init = arm_v7m_class_init }, > { .name = "cortex-m3", .initfn = cortex_m3_initfn, > .class_init = arm_v7m_class_init }, > @@ -2554,6 +2555,7 @@ static const ARMCPUInfo arm_cpus[] = { > .class_init = arm_v7m_class_init }, > { .name = "cortex-r5", .initfn = cortex_r5_initfn }, > { .name = "cortex-r5f", .initfn = cortex_r5f_initfn }, > +#endif > { .name = "cortex-a7", .initfn = cortex_a7_initfn }, > { .name = "cortex-a8", .initfn = cortex_a8_initfn }, > { .name = "cortex-a9", .initfn = cortex_a9_initfn },
Ah, patch 1 fixed here. I think these should be squashed. r~