| Message ID | 20200316120049.11225-11-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | accel: Allow targets to use Kconfig, disable semihosting by default | expand |
On 3/16/20 5:00 AM, Philippe Mathieu-Daudé wrote: > On ARM, the semihosting feature is always required on user-space, > and is also used by system emulation. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/aarch64-linux-user-common.mak | 4 ++++ > default-configs/aarch64-linux-user.mak | 2 ++ > default-configs/aarch64_be-linux-user.mak | 2 ++ > default-configs/arm-linux-user-common.mak | 4 ++++ > default-configs/arm-linux-user.mak | 2 ++ > default-configs/arm-softmmu.mak | 4 +++- > default-configs/armeb-linux-user.mak | 2 ++ > 7 files changed, 19 insertions(+), 1 deletion(-) > create mode 100644 default-configs/aarch64-linux-user-common.mak > create mode 100644 default-configs/arm-linux-user-common.mak Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/default-configs/aarch64-linux-user-common.mak b/default-configs/aarch64-linux-user-common.mak new file mode 100644 index 0000000000..94c0cdf826 --- /dev/null +++ b/default-configs/aarch64-linux-user-common.mak @@ -0,0 +1,4 @@ +# Common aarch64*-linux-user CONFIG defines + +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y diff --git a/default-configs/aarch64-linux-user.mak b/default-configs/aarch64-linux-user.mak index 0a5b08a007..d27232cbc6 100644 --- a/default-configs/aarch64-linux-user.mak +++ b/default-configs/aarch64-linux-user.mak @@ -1 +1,3 @@ # Default configuration for aarch64-linux-user + +include aarch64-linux-user-common.mak diff --git a/default-configs/aarch64_be-linux-user.mak b/default-configs/aarch64_be-linux-user.mak index a69d9d2e41..7dee7ba4cb 100644 --- a/default-configs/aarch64_be-linux-user.mak +++ b/default-configs/aarch64_be-linux-user.mak @@ -1 +1,3 @@ # Default configuration for aarch64_be-linux-user + +include aarch64-linux-user-common.mak diff --git a/default-configs/arm-linux-user-common.mak b/default-configs/arm-linux-user-common.mak new file mode 100644 index 0000000000..67acd961f3 --- /dev/null +++ b/default-configs/arm-linux-user-common.mak @@ -0,0 +1,4 @@ +# Common arm*-linux-user CONFIG defines + +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak index 413361a022..7d45e4d20a 100644 --- a/default-configs/arm-linux-user.mak +++ b/default-configs/arm-linux-user.mak @@ -1 +1,3 @@ # Default configuration for arm-linux-user + +include arm-linux-user-common.mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 36a0e89daa..8b89d8c4c0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,5 +1,8 @@ # Default configuration for arm-softmmu +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y + # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y @@ -40,5 +43,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak index bf2ffe7038..485132f606 100644 --- a/default-configs/armeb-linux-user.mak +++ b/default-configs/armeb-linux-user.mak @@ -1 +1,3 @@ # Default configuration for armeb-linux-user + +include arm-linux-user-common.mak
On ARM, the semihosting feature is always required on user-space, and is also used by system emulation. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/aarch64-linux-user-common.mak | 4 ++++ default-configs/aarch64-linux-user.mak | 2 ++ default-configs/aarch64_be-linux-user.mak | 2 ++ default-configs/arm-linux-user-common.mak | 4 ++++ default-configs/arm-linux-user.mak | 2 ++ default-configs/arm-softmmu.mak | 4 +++- default-configs/armeb-linux-user.mak | 2 ++ 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 default-configs/aarch64-linux-user-common.mak create mode 100644 default-configs/arm-linux-user-common.mak