| Message ID | 20230503193833.29047-3-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: disable-tcg and without-default-devices fixes | expand |
On 5/3/23 21:38, Fabiano Rosas wrote: > We cannot allow this config to be disabled at the moment as not all of > the relevant code is protected by it. > > Commit 29d9efca16 ("arm/Kconfig: Do not build TCG-only boards on a > KVM-only build") moved the CONFIGs of several boards to Kconfig, so it > is now possible that nothing selects ARM_V7M (e.g. when doing a > --without-default-devices build). > > Return the CONFIG_ARM_V7M entry to default.mak while we don't enable > the compilation without it. Note that this goes against the intention > of commit cd43648a44 ("hw/arm: move CONFIG_V7M out of > default-devices"), but at this point this is the smallest change we > can do. If this is a dependency of target/arm/tcg/translate.c on ARM_V7M, it should be written as diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 3f3394a22b23..498bdba1e139 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -1,5 +1,6 @@ config ARM bool + select ARM_V7M if TCG config AARCH64 bool Paolo > Fixes: 29d9efca16 ("arm/Kconfig: Do not build TCG-only boards on a KVM-only build") > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > configs/devices/arm-softmmu/default.mak | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak > index 647fbce88d..0c2b24d6bb 100644 > --- a/configs/devices/arm-softmmu/default.mak > +++ b/configs/devices/arm-softmmu/default.mak > @@ -4,3 +4,4 @@ > # CONFIG_TEST_DEVICES=n > > CONFIG_ARM_VIRT=y > +CONFIG_ARM_V7M=y
diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak index 647fbce88d..0c2b24d6bb 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -4,3 +4,4 @@ # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y +CONFIG_ARM_V7M=y
We cannot allow this config to be disabled at the moment as not all of the relevant code is protected by it. Commit 29d9efca16 ("arm/Kconfig: Do not build TCG-only boards on a KVM-only build") moved the CONFIGs of several boards to Kconfig, so it is now possible that nothing selects ARM_V7M (e.g. when doing a --without-default-devices build). Return the CONFIG_ARM_V7M entry to default.mak while we don't enable the compilation without it. Note that this goes against the intention of commit cd43648a44 ("hw/arm: move CONFIG_V7M out of default-devices"), but at this point this is the smallest change we can do. Fixes: 29d9efca16 ("arm/Kconfig: Do not build TCG-only boards on a KVM-only build") Signed-off-by: Fabiano Rosas <farosas@suse.de> --- configs/devices/arm-softmmu/default.mak | 1 + 1 file changed, 1 insertion(+)