[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 48/54] sh4-softmmu.mak: express dependencies with Kco
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 48/54] sh4-softmmu.mak: express dependencies with Kconfig |
Date: |
Mon, 4 Mar 2019 19:20:08 +0100 |
%-softmmu.mak only keep boards and optional device
definitions in Kconfig mode.
Note that USB_OHCI was missing (it was brought in via pci.mak,
but r2d needs the sysbus version) and SERIAL is not used.
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/sh4-softmmu.mak | 18 +++++++-----------
default-configs/sh4eb-softmmu.mak | 13 +------------
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
--
1.8.3.1
- [Qemu-devel] [PULL 27/54] isa: express SuperIO dependencies with Kconfig, (continued)
- [Qemu-devel] [PULL 27/54] isa: express SuperIO dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 29/54] sd: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 31/54] i386-softmmu.mak: remove all CONFIG_* except boards definitions, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 30/54] ipmi: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 28/54] ssi: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 32/54] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 33/54] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 36/54] ppc: Express dependencies of the embedded machines with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 42/54] microblaze-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 41/54] m68k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 48/54] sh4-softmmu.mak: express dependencies with Kconfig,
Paolo Bonzini <=
- [Qemu-devel] [PULL 40/54] lm32-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 34/54] ppc: Express dependencies of the Mac machines with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 44/54] nios2-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 35/54] ppc: Express dependencies of the Sam460EX machines with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 43/54] moxie-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 53/54] .travis.yml: test that no-default-device builds do not regress, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 37/54] alpha-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 50/54] sparc64-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 49/54] sparc-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04