Skip to content

Commit

Permalink
config: move ide core and pci to pci.mak
Browse files Browse the repository at this point in the history 
Every device that can do PCI should also be able to do IDE. So let's move
the IDE definitions over to pci.mak.

Signed-off-by: Alexander Graf <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
@agraf @kevmw
agraf authored and kevmw committed Dec 17, 2010
1 parent f6ad2e3 commit 461d13d
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 33 deletions.
1 change: 0 additions & 1 deletion default-configs/arm-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CONFIG_ECC=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_SD=y
CONFIG_IDE_CORE=y
CONFIG_MAX7310=y
CONFIG_WM8750=y
CONFIG_TWL92230=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/i386-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ CONFIG_FDC=y
CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/mips-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_PIIX4=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/mips64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_PIIX4=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/mips64el-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_PIIX4=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_IDE_VIA=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/mipsel-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_PIIX4=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
Expand Down
3 changes: 3 additions & 0 deletions default-configs/pci.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ CONFIG_PCNET_COMMON=y
CONFIG_LSI_SCSI_PCI=y
CONFIG_RTL8139_PCI=y
CONFIG_E1000_PCI=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
3 changes: 0 additions & 3 deletions default-configs/ppc-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ CONFIG_GRACKLE_PCI=y
CONFIG_UNIN_PCI=y
CONFIG_DEC_PCI=y
CONFIG_PPCE500_PCI=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/ppc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ CONFIG_GRACKLE_PCI=y
CONFIG_UNIN_PCI=y
CONFIG_DEC_PCI=y
CONFIG_PPCE500_PCI=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y
Expand Down
3 changes: 0 additions & 3 deletions default-configs/ppcemb-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ CONFIG_GRACKLE_PCI=y
CONFIG_UNIN_PCI=y
CONFIG_DEC_PCI=y
CONFIG_PPCE500_PCI=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y
Expand Down
1 change: 0 additions & 1 deletion default-configs/sh4-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
include pci.mak
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_IDE_CORE=y
CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y
1 change: 0 additions & 1 deletion default-configs/sh4eb-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
include pci.mak
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_IDE_CORE=y
CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y
3 changes: 0 additions & 3 deletions default-configs/sparc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ CONFIG_SERIAL=y
CONFIG_PARALLEL=y
CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
3 changes: 0 additions & 3 deletions default-configs/x86_64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ CONFIG_FDC=y
CONFIG_ACPI=y
CONFIG_APM=y
CONFIG_DMA=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
Expand Down

0 comments on commit 461d13d

Please sign in to comment.