diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-25 13:36:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-03 15:47:47 +0200 |
| commit | c8b39c9b5b901b173fbbb0ec3f147e9694ece48c (patch) | |
| tree | e1f5646ca6629f1db5b309a6ce9e7ba3faaa68cb | |
| parent | 8a1f6d0ebd21efad6ea4843796d550ce4c14e81c (diff) | |
| download | qemu-c8b39c9b5b901b173fbbb0ec3f147e9694ece48c.zip qemu-c8b39c9b5b901b173fbbb0ec3f147e9694ece48c.tar.gz qemu-c8b39c9b5b901b173fbbb0ec3f147e9694ece48c.tar.bz2 | |
openrisc: switch boards to "default y"
Some targets use "default y" for boards to filter out those that require
TCG. For consistency we are switching all other targets to do the same.
Continue with OpenRISC.
No changes to generated config-devices.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 2 | ||||
| -rw-r--r-- | configs/devices/or1k-softmmu/default.mak | 5 | ||||
| -rw-r--r-- | hw/openrisc/Kconfig | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 8111324..49cd50c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# mips64el, x86_64 +# mips64el, or1k, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/configs/devices/or1k-softmmu/default.mak b/configs/devices/or1k-softmmu/default.mak index 3aecdf9..efe3bc2 100644 --- a/configs/devices/or1k-softmmu/default.mak +++ b/configs/devices/or1k-softmmu/default.mak @@ -5,6 +5,5 @@ # CONFIG_TEST_DEVICES=n # Boards: -# -CONFIG_OR1K_SIM=y -CONFIG_OR1K_VIRT=y +# CONFIG_OR1K_SIM=n +# CONFIG_OR1K_VIRT=n diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig index 97af258..9c9015e 100644 --- a/hw/openrisc/Kconfig +++ b/hw/openrisc/Kconfig @@ -1,5 +1,7 @@ config OR1K_SIM bool + default y + depends on OPENRISC select SERIAL select OPENCORES_ETH select OMPIC @@ -7,6 +9,8 @@ config OR1K_SIM config OR1K_VIRT bool + default y + depends on OPENRISC imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES |