[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v16 94/99] target/arm: move CONFIG_V7M out of default-devices
From: |
Alex Bennée |
Subject: |
[PATCH v16 94/99] target/arm: move CONFIG_V7M out of default-devices |
Date: |
Fri, 4 Jun 2021 16:53:07 +0100 |
We currently select CONFIG_V7M for a bunch of our m-profile devices.
The last sticking point is translate.c which cannot be compiled
without expecting v7m support. Express this dependency in Kconfig
rather than in default devices as a stepping stone to a fully
configurable translate.c.
While we are at it we also need to select ARM_COMPATIBLE_SEMIHOSTING
as that is implied for M profile machines.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
default-configs/devices/arm-softmmu.mak | 3 ---
hw/arm/Kconfig | 3 +++
target/arm/tcg/sysemu/meson.build | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/default-configs/devices/arm-softmmu.mak
b/default-configs/devices/arm-softmmu.mak
index 0500156a0c..4114aa9e35 100644
--- a/default-configs/devices/arm-softmmu.mak
+++ b/default-configs/devices/arm-softmmu.mak
@@ -1,8 +1,5 @@
# Default configuration for arm-softmmu
-# TODO: ARM_V7M is currently always required - make this more flexible!
-CONFIG_ARM_V7M=y
-
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 67723d9ea6..afaf807c92 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -296,7 +296,10 @@ config ZYNQ
config ARM_V7M
bool
+ # currently v7M must be included in a TCG build due to translate.c
+ default y if TCG && (ARM || AARCH64)
select PTIMER
+ select ARM_COMPATIBLE_SEMIHOSTING
config ALLWINNER_A10
bool
diff --git a/target/arm/tcg/sysemu/meson.build
b/target/arm/tcg/sysemu/meson.build
index 56e4b5ccea..520f305deb 100644
--- a/target/arm/tcg/sysemu/meson.build
+++ b/target/arm/tcg/sysemu/meson.build
@@ -1,7 +1,10 @@
arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
'debug_helper.c',
- 'm_helper.c',
'mte_helper.c',
'tcg-cpu.c',
'tlb_helper.c',
))
+
+arm_softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files(
+ 'm_helper.c',
+))
--
2.20.1
- Re: [PATCH v16 78/99] target/arm: cpu-exceptions, cpu-exceptions-aa64: new modules, (continued)
Re: [PATCH v16 78/99] target/arm: cpu-exceptions, cpu-exceptions-aa64: new modules, Richard Henderson, 2021/06/05
[PATCH v16 61/99] target/arm: remove broad "else" statements when checking accels, Alex Bennée, 2021/06/04
[PATCH v16 79/99] target/arm: tcg: restrict ZCR cpregs to TARGET_AARCH64, Alex Bennée, 2021/06/04
[PATCH v16 62/99] target/arm: remove kvm-stub.c, Alex Bennée, 2021/06/04
[PATCH v16 94/99] target/arm: move CONFIG_V7M out of default-devices,
Alex Bennée <=
[PATCH v16 70/99] target/arm: move TCG gt timer creation code in tcg/, Alex Bennée, 2021/06/04
[PATCH v16 18/99] target/arm: tcg: add sysemu and user subdirs, Alex Bennée, 2021/06/04
[PATCH v16 52/99] target/arm: rename handle_semihosting to tcg_handle_semihosting, Alex Bennée, 2021/06/04
[PATCH v16 32/99] target/arm: move cpsr_read, cpsr_write to cpu_common, Alex Bennée, 2021/06/04
[PATCH v16 26/99] target/arm: move physical address translation to cpu-mmu, Alex Bennée, 2021/06/04
[PATCH v16 64/99] tests: do not run test-hmp on all machines for ARM KVM-only, Alex Bennée, 2021/06/04
[PATCH v16 28/99] target/arm: split cpregs from tcg/helper.c, Alex Bennée, 2021/06/04