Message ID | 1344859872-6141-1-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
Am 13.08.2012 14:11, schrieb Andreas Färber: > Avoids some unnecessary dependencies on cpu.h and prepares for > a future armeb-softmmu where most machines would not be built. > > Defer touching the SoC devices since most have implicit or explicit > dependencies on the CPU. > > Signed-off-by: Andreas Färber <andreas.faerber@web.de> Err sorry, should be SoB <afaerber@suse.de>. (Muphry's law!) /-F > --- > default-configs/arm-softmmu.mak | 18 ++++++++++++++++++ > hw/Makefile.objs | 20 ++++++++++++++++++++ > hw/arm/Makefile.objs | 15 +++------------ > 3 files changed, 41 insertions(+), 12 deletions(-) > > v1 -> v2: > * Move new lm4549.o alongside pl041.o (PMM). > * Defer moving stellaris_enet.o until stellaris.o is cleaned up (PMM). > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index e542b4f..f335a72 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -27,3 +27,21 @@ CONFIG_SMC91C111=y > CONFIG_DS1338=y > CONFIG_PFLASH_CFI01=y > CONFIG_PFLASH_CFI02=y > + > +CONFIG_ARM_TIMER=y > +CONFIG_PL011=y > +CONFIG_PL022=y > +CONFIG_PL031=y > +CONFIG_PL041=y > +CONFIG_PL050=y > +CONFIG_PL061=y > +CONFIG_PL080=y > +CONFIG_PL110=y > +CONFIG_PL181=y > +CONFIG_PL190=y > +CONFIG_PL310=y > +CONFIG_CADENCE=y > +CONFIG_XGMAC=y > + > +CONFIG_VERSATILE_PCI=y > +CONFIG_VERSATILE_I2C=y > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index 6eee9a0..7f57ed5 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -74,6 +74,26 @@ hw-obj-$(CONFIG_PUV3) += puv3_gpio.o > hw-obj-$(CONFIG_PUV3) += puv3_pm.o > hw-obj-$(CONFIG_PUV3) += puv3_dma.o > > +# ARM devices > +hw-obj-$(CONFIG_ARM_TIMER) += arm_timer.o > +hw-obj-$(CONFIG_PL011) += pl011.o > +hw-obj-$(CONFIG_PL022) += pl022.o > +hw-obj-$(CONFIG_PL031) += pl031.o > +hw-obj-$(CONFIG_PL041) += pl041.o lm4549.o > +hw-obj-$(CONFIG_PL050) += pl050.o > +hw-obj-$(CONFIG_PL061) += pl061.o > +hw-obj-$(CONFIG_PL080) += pl080.o > +hw-obj-$(CONFIG_PL110) += pl110.o > +hw-obj-$(CONFIG_PL181) += pl181.o > +hw-obj-$(CONFIG_PL190) += pl190.o > +hw-obj-$(CONFIG_PL310) += arm_l2x0.o > +hw-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o > +hw-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o > +hw-obj-$(CONFIG_CADENCE) += cadence_uart.o > +hw-obj-$(CONFIG_CADENCE) += cadence_ttc.o > +hw-obj-$(CONFIG_CADENCE) += cadence_gem.o > +hw-obj-$(CONFIG_XGMAC) += xgmac.o > + > # PCI watchdog devices > hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index c413780..2b39fb3 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -1,10 +1,5 @@ > -obj-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o > -obj-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o > -obj-y += versatile_pci.o > -obj-y += versatile_i2c.o > -obj-y += cadence_uart.o > -obj-y += cadence_ttc.o > -obj-y += cadence_gem.o > +obj-y = integratorcp.o versatilepb.o arm_pic.o > +obj-y += arm_boot.o > obj-y += xilinx_zynq.o zynq_slcr.o > obj-y += arm_gic.o arm_gic_common.o > obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o > @@ -12,12 +7,9 @@ obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o > obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o > obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o > obj-y += exynos4210_rtc.o exynos4210_i2c.o > -obj-y += arm_l2x0.o > obj-y += arm_mptimer.o a15mpcore.o > -obj-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o > +obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o > obj-y += highbank.o > -obj-y += pl061.o > -obj-y += xgmac.o > obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o > obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o > obj-y += gumstix.o > @@ -37,7 +29,6 @@ obj-y += strongarm.o > obj-y += collie.o > obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o > obj-y += kzm.o > -obj-y += pl041.o lm4549.o > obj-$(CONFIG_FDT) += ../device_tree.o > > obj-y := $(addprefix ../,$(obj-y)) >
On 13 August 2012 13:15, Andreas Färber <afaerber@suse.de> wrote: > Am 13.08.2012 14:11, schrieb Andreas Färber: >> Avoids some unnecessary dependencies on cpu.h and prepares for >> a future armeb-softmmu where most machines would not be built. >> >> Defer touching the SoC devices since most have implicit or explicit >> dependencies on the CPU. >> >> Signed-off-by: Andreas Färber <andreas.faerber@web.de> > > Err sorry, should be SoB <afaerber@suse.de>. (Muphry's law!) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> ...last patch to make it under the wire for ARM for 1.2. Pullreq coming out later today. -- PMM
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index e542b4f..f335a72 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -27,3 +27,21 @@ CONFIG_SMC91C111=y CONFIG_DS1338=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y + +CONFIG_ARM_TIMER=y +CONFIG_PL011=y +CONFIG_PL022=y +CONFIG_PL031=y +CONFIG_PL041=y +CONFIG_PL050=y +CONFIG_PL061=y +CONFIG_PL080=y +CONFIG_PL110=y +CONFIG_PL181=y +CONFIG_PL190=y +CONFIG_PL310=y +CONFIG_CADENCE=y +CONFIG_XGMAC=y + +CONFIG_VERSATILE_PCI=y +CONFIG_VERSATILE_I2C=y diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6eee9a0..7f57ed5 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -74,6 +74,26 @@ hw-obj-$(CONFIG_PUV3) += puv3_gpio.o hw-obj-$(CONFIG_PUV3) += puv3_pm.o hw-obj-$(CONFIG_PUV3) += puv3_dma.o +# ARM devices +hw-obj-$(CONFIG_ARM_TIMER) += arm_timer.o +hw-obj-$(CONFIG_PL011) += pl011.o +hw-obj-$(CONFIG_PL022) += pl022.o +hw-obj-$(CONFIG_PL031) += pl031.o +hw-obj-$(CONFIG_PL041) += pl041.o lm4549.o +hw-obj-$(CONFIG_PL050) += pl050.o +hw-obj-$(CONFIG_PL061) += pl061.o +hw-obj-$(CONFIG_PL080) += pl080.o +hw-obj-$(CONFIG_PL110) += pl110.o +hw-obj-$(CONFIG_PL181) += pl181.o +hw-obj-$(CONFIG_PL190) += pl190.o +hw-obj-$(CONFIG_PL310) += arm_l2x0.o +hw-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o +hw-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o +hw-obj-$(CONFIG_CADENCE) += cadence_uart.o +hw-obj-$(CONFIG_CADENCE) += cadence_ttc.o +hw-obj-$(CONFIG_CADENCE) += cadence_gem.o +hw-obj-$(CONFIG_XGMAC) += xgmac.o + # PCI watchdog devices hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index c413780..2b39fb3 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,10 +1,5 @@ -obj-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o -obj-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o -obj-y += versatile_pci.o -obj-y += versatile_i2c.o -obj-y += cadence_uart.o -obj-y += cadence_ttc.o -obj-y += cadence_gem.o +obj-y = integratorcp.o versatilepb.o arm_pic.o +obj-y += arm_boot.o obj-y += xilinx_zynq.o zynq_slcr.o obj-y += arm_gic.o arm_gic_common.o obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o @@ -12,12 +7,9 @@ obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o obj-y += exynos4210_rtc.o exynos4210_i2c.o -obj-y += arm_l2x0.o obj-y += arm_mptimer.o a15mpcore.o -obj-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o +obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o obj-y += highbank.o -obj-y += pl061.o -obj-y += xgmac.o obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o obj-y += gumstix.o @@ -37,7 +29,6 @@ obj-y += strongarm.o obj-y += collie.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o obj-y += kzm.o -obj-y += pl041.o lm4549.o obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y))
Avoids some unnecessary dependencies on cpu.h and prepares for a future armeb-softmmu where most machines would not be built. Defer touching the SoC devices since most have implicit or explicit dependencies on the CPU. Signed-off-by: Andreas Färber <andreas.faerber@web.de> --- default-configs/arm-softmmu.mak | 18 ++++++++++++++++++ hw/Makefile.objs | 20 ++++++++++++++++++++ hw/arm/Makefile.objs | 15 +++------------ 3 files changed, 41 insertions(+), 12 deletions(-) v1 -> v2: * Move new lm4549.o alongside pl041.o (PMM). * Defer moving stellaris_enet.o until stellaris.o is cleaned up (PMM).