Skip to content

Commit

Permalink
hw: make all of hw/ide/ configurable via default-configs/
Browse files Browse the repository at this point in the history
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Apr 8, 2013
1 parent 6e79074 commit 9a1179d
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions default-configs/arm-softmmu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions default-configs/sh4-softmmu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y
CONFIG_IDE_MMIO=y
1 change: 1 addition & 0 deletions default-configs/sh4eb-softmmu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y
CONFIG_IDE_MMIO=y
2 changes: 1 addition & 1 deletion hw/arm/Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions hw/ide/Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion hw/sh4/Makefile.objs
Original file line number Diff line number Diff line change
@@ -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))

Expand Down

0 comments on commit 9a1179d

Please sign in to comment.