haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sh4-softmmu.mak: express dependencies with Kconfig

Browse source 
%-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 <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-01-29 12:16:27 +01:00
parent 9e5c2056d1
commit 7ab58d4c84
3 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
default-configs/sh4-softmmu.mak
View file

@ -1,15 +1,11 @@
# Default configuration for sh4eb-softmmu # Default configuration for sh4eb-softmmu
CONFIG_PCI=y # Uncomment the following lines to disable these optional devices:
CONFIG_PCI_DEVICES=y #
CONFIG_SERIAL=y #CONFIG_PCI_DEVICES=n
CONFIG_PFLASH_CFI02=y #CONFIG_TEST_DEVICES=n
CONFIG_SH4=y
CONFIG_IDE_MMIO=y # Boards:
CONFIG_SM501=y #
CONFIG_TEST_DEVICES=y
CONFIG_I82378=y
CONFIG_I82374=y
CONFIG_R2D=y CONFIG_R2D=y
CONFIG_SHIX=y CONFIG_SHIX=y
CONFIG_TEST_DEVICES=y

13
default-configs/sh4eb-softmmu.mak
View file

@ -1,14 +1,3 @@
# Default configuration for sh4eb-softmmu # Default configuration for sh4eb-softmmu
CONFIG_PCI=y include sh4-softmmu.mak
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

11
hw/sh4/Kconfig
View file

@ -1,8 +1,19 @@
config R2D config R2D
bool 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 config SHIX
bool bool
select SH7750
select SH4
config SH7750 config SH7750
bool bool