diff options
| -rw-r--r-- | default-configs/sh4-softmmu.mak | 18 | ||||
| -rw-r--r-- | default-configs/sh4eb-softmmu.mak | 13 | ||||
| -rw-r--r-- | hw/sh4/Kconfig | 11 |
3 files changed, 19 insertions, 23 deletions
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 4ba5584..565e8b0 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,15 +1,11 @@ # Default configuration for sh4eb-softmmu -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_PFLASH_CFI02=y -CONFIG_SH4=y -CONFIG_IDE_MMIO=y -CONFIG_SM501=y -CONFIG_TEST_DEVICES=y -CONFIG_I82378=y -CONFIG_I82374=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n +#CONFIG_TEST_DEVICES=n + +# Boards: +# CONFIG_R2D=y CONFIG_SHIX=y -CONFIG_TEST_DEVICES=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 9717673..522a7a5 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,14 +1,3 @@ # Default configuration for sh4eb-softmmu -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_PFLASH_CFI02=y -CONFIG_SH4=y -CONFIG_IDE_MMIO=y -CONFIG_SM501=y -CONFIG_TEST_DEVICES=y -CONFIG_I82378=y -CONFIG_I82374=y -CONFIG_R2D=y -CONFIG_SHIX=y +include sh4-softmmu.mak diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 1ea2bc3..8597613 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,8 +1,19 @@ config R2D bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82378 if TEST_DEVICES + select IDE_MMIO + select PFLASH_CFI02 + select USB_OHCI + select PCI + select SM501 + select SH4 config SHIX bool + select SH7750 + select SH4 config SH7750 bool |