From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0tYI-0007Ag-S1 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 08:15:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0tYH-0001iO-8r for qemu-devel@nongnu.org; Mon, 13 Aug 2012 08:15:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53417 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0tYG-0001iI-V3 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 08:15:21 -0400 Message-ID: <5028EFD6.4050300@suse.de> Date: Mon, 13 Aug 2012 14:15:18 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1344859872-6141-1-git-send-email-afaerber@suse.de> In-Reply-To: <1344859872-6141-1-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-1.2 v2] arm: Move some ARM devices into libhw List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org Am 13.08.2012 14:11, schrieb Andreas F=C3=A4rber: > Avoids some unnecessary dependencies on cpu.h and prepares for > a future armeb-softmmu where most machines would not be built. >=20 > Defer touching the SoC devices since most have implicit or explicit > dependencies on the CPU. >=20 > Signed-off-by: Andreas F=C3=A4rber Err sorry, should be SoB . (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(-) >=20 > v1 -> v2: > * Move new lm4549.o alongside pl041.o (PMM). > * Defer moving stellaris_enet.o until stellaris.o is cleaned up (PMM). >=20 > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-soft= mmu.mak > index e542b4f..f335a72 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -27,3 +27,21 @@ CONFIG_SMC91C111=3Dy > CONFIG_DS1338=3Dy > CONFIG_PFLASH_CFI01=3Dy > CONFIG_PFLASH_CFI02=3Dy > + > +CONFIG_ARM_TIMER=3Dy > +CONFIG_PL011=3Dy > +CONFIG_PL022=3Dy > +CONFIG_PL031=3Dy > +CONFIG_PL041=3Dy > +CONFIG_PL050=3Dy > +CONFIG_PL061=3Dy > +CONFIG_PL080=3Dy > +CONFIG_PL110=3Dy > +CONFIG_PL181=3Dy > +CONFIG_PL190=3Dy > +CONFIG_PL310=3Dy > +CONFIG_CADENCE=3Dy > +CONFIG_XGMAC=3Dy > + > +CONFIG_VERSATILE_PCI=3Dy > +CONFIG_VERSATILE_I2C=3Dy > 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) +=3D puv3_gpio.o > hw-obj-$(CONFIG_PUV3) +=3D puv3_pm.o > hw-obj-$(CONFIG_PUV3) +=3D puv3_dma.o > =20 > +# ARM devices > +hw-obj-$(CONFIG_ARM_TIMER) +=3D arm_timer.o > +hw-obj-$(CONFIG_PL011) +=3D pl011.o > +hw-obj-$(CONFIG_PL022) +=3D pl022.o > +hw-obj-$(CONFIG_PL031) +=3D pl031.o > +hw-obj-$(CONFIG_PL041) +=3D pl041.o lm4549.o > +hw-obj-$(CONFIG_PL050) +=3D pl050.o > +hw-obj-$(CONFIG_PL061) +=3D pl061.o > +hw-obj-$(CONFIG_PL080) +=3D pl080.o > +hw-obj-$(CONFIG_PL110) +=3D pl110.o > +hw-obj-$(CONFIG_PL181) +=3D pl181.o > +hw-obj-$(CONFIG_PL190) +=3D pl190.o > +hw-obj-$(CONFIG_PL310) +=3D arm_l2x0.o > +hw-obj-$(CONFIG_VERSATILE_PCI) +=3D versatile_pci.o > +hw-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o > +hw-obj-$(CONFIG_CADENCE) +=3D cadence_uart.o > +hw-obj-$(CONFIG_CADENCE) +=3D cadence_ttc.o > +hw-obj-$(CONFIG_CADENCE) +=3D cadence_gem.o > +hw-obj-$(CONFIG_XGMAC) +=3D xgmac.o > + > # PCI watchdog devices > hw-obj-$(CONFIG_PCI) +=3D wdt_i6300esb.o > =20 > 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 =3D integratorcp.o versatilepb.o arm_pic.o arm_timer.o > -obj-y +=3D arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o = pl190.o > -obj-y +=3D versatile_pci.o > -obj-y +=3D versatile_i2c.o > -obj-y +=3D cadence_uart.o > -obj-y +=3D cadence_ttc.o > -obj-y +=3D cadence_gem.o > +obj-y =3D integratorcp.o versatilepb.o arm_pic.o > +obj-y +=3D arm_boot.o > obj-y +=3D xilinx_zynq.o zynq_slcr.o > obj-y +=3D arm_gic.o arm_gic_common.o > obj-y +=3D realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpco= re.o > @@ -12,12 +7,9 @@ obj-y +=3D exynos4210_gic.o exynos4210_combiner.o exy= nos4210.o > obj-y +=3D exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o > obj-y +=3D exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o > obj-y +=3D exynos4210_rtc.o exynos4210_i2c.o > -obj-y +=3D arm_l2x0.o > obj-y +=3D arm_mptimer.o a15mpcore.o > -obj-y +=3D armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o > +obj-y +=3D armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o > obj-y +=3D highbank.o > -obj-y +=3D pl061.o > -obj-y +=3D xgmac.o > obj-y +=3D pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_d= ma.o > obj-y +=3D pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o > obj-y +=3D gumstix.o > @@ -37,7 +29,6 @@ obj-y +=3D strongarm.o > obj-y +=3D collie.o > obj-y +=3D imx_serial.o imx_ccm.o imx_timer.o imx_avic.o > obj-y +=3D kzm.o > -obj-y +=3D pl041.o lm4549.o > obj-$(CONFIG_FDT) +=3D ../device_tree.o > =20 > obj-y :=3D $(addprefix ../,$(obj-y)) >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg