From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2sS-0006KF-VL for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2sR-0006NO-Ih for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:12:00 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:38691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gP-0001DF-Qz for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:33 -0400 Received: by mail-ee0-f54.google.com with SMTP id e51so282907eek.41 for ; Tue, 02 Apr 2013 07:59:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 2 Apr 2013 16:58:40 +0200 Message-Id: <1364914749-11141-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/35] hw: make all of hw/ide/ configurable via default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/ide/Makefile.objs | 2 ++ hw/sh4/Makefile.objs | 1 - 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ab87035..2d53895 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -29,6 +29,7 @@ CONFIG_SMC91C111=y CONFIG_DS1338=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y +CONFIG_MICRODRIVE=y CONFIG_ARM_TIMER=y CONFIG_PL011=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index e08b2ee..bcafc27 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_IDE_MMIO=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 3a84535..8372b0d 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_IDE_MMIO=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index f5f7d0e..6253dbc 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -11,7 +11,7 @@ obj-y += arm_mptimer.o a15mpcore.o obj-y += armv7m_nvic.o stellaris_enet.o obj-y += pxa2xx_timer.o pxa2xx_dma.o obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o -obj-y += zaurus.o ide/microdrive.o tc6393xb.o +obj-y += zaurus.o tc6393xb.o obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ omap_gpio.o omap_intc.o omap_uart.o obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index 5c8c22a..729e9bd 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -5,6 +5,8 @@ common-obj-$(CONFIG_IDE_ISA) += isa.o common-obj-$(CONFIG_IDE_PIIX) += piix.o common-obj-$(CONFIG_IDE_CMD646) += cmd646.o common-obj-$(CONFIG_IDE_MACIO) += macio.o +common-obj-$(CONFIG_IDE_MMIO) += mmio.o common-obj-$(CONFIG_IDE_VIA) += via.o +common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o common-obj-$(CONFIG_AHCI) += ich.o diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 72b6a1f..4f2ac2a 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,6 +1,5 @@ obj-y = tc58128.o obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o -obj-y += ide/mmio.o obj-y := $(addprefix ../,$(obj-y)) -- 1.8.1.4