On Thu, 16 May 2019 at 19:16, Philippe Mathieu-Daudé <phi...@redhat.com> wrote: > > On 5/16/19 6:38 PM, Peter Maydell wrote: > > The header file hw/arm/arm.h now includes only declarations > > relating to hw/arm/boot.c functionality. Rename it accordingly, > > and adjust its header comment. > > > > The bulk of this commit was created via > > perl -pi -e 's|hw/arm/arm.h|hw/arm/boot.h|' hw/arm/*.c include/hw/arm/*.h > > > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > > ---
> > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h > > index 11ec0179db5..24078fd1895 100644 > > --- a/include/hw/arm/aspeed_soc.h > > +++ b/include/hw/arm/aspeed_soc.h > > @@ -12,7 +12,7 @@ > > #ifndef ASPEED_SOC_H > > #define ASPEED_SOC_H > > > > -#include "hw/arm/arm.h" > > +#include "hw/arm/boot.h" > > I guess we can drop this one... > > > #include "hw/intc/aspeed_vic.h" > > #include "hw/misc/aspeed_scu.h" > > #include "hw/misc/aspeed_sdmc.h" > > diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h > > index 93248399ba0..1b04a0e7fe8 100644 > > --- a/include/hw/arm/bcm2836.h > > +++ b/include/hw/arm/bcm2836.h > > @@ -11,7 +11,7 @@ > > #ifndef BCM2836_H > > #define BCM2836_H > > > > -#include "hw/arm/arm.h" > > +#include "hw/arm/boot.h" > > ... this one too ... > > > --- a/hw/arm/msf2-soc.c > > +++ b/hw/arm/msf2-soc.c > > @@ -26,7 +26,7 @@ > > #include "qemu/units.h" > > #include "qapi/error.h" > > #include "qemu-common.h" > > -#include "hw/arm/arm.h" > > +#include "hw/arm/boot.h" > > ... and this one too, it is not required. > > > #include "exec/address-spaces.h" > > #include "hw/char/serial.h" > > #include "hw/boards.h" I guess so. I decided I didn't really feel like trying to test whether all of them were needed, since they're at least all includes in board or SoC sources in hw/arm... thanks -- PMM
