| Message ID | 20210131111316.232778-11-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > SEMIHOSTING is an architecture feature, move its declaration to > each target/ARCH/. I'm going to punt on this one and leave it to the arch maintainers to opine because AIUI in a lot of cases semihosting is more of a "useful hack" than something mandated by the architecture. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > default-configs/devices/lm32-softmmu.mak | 2 -- > default-configs/devices/m68k-softmmu.mak | 2 -- > default-configs/devices/mips-softmmu-common.mak | 3 --- > default-configs/devices/nios2-softmmu.mak | 2 -- > default-configs/devices/unicore32-softmmu.mak | 1 - > default-configs/devices/xtensa-softmmu.mak | 2 -- > target/lm32/Kconfig | 1 + > target/m68k/Kconfig | 1 + > target/mips/Kconfig | 1 + > target/nios2/Kconfig | 1 + > target/unicore32/Kconfig | 1 + > target/xtensa/Kconfig | 1 + > 12 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak > index 1bce3f6e8b6..1f69795b749 100644 > --- a/default-configs/devices/lm32-softmmu.mak > +++ b/default-configs/devices/lm32-softmmu.mak > @@ -4,8 +4,6 @@ > # > #CONFIG_MILKYMIST_TMU2=n # disabling it actually causes compile-time failures > > -CONFIG_SEMIHOSTING=y > - > # Boards: > # > CONFIG_LM32_EVR=y > diff --git a/default-configs/devices/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak > index 6629fd2aa33..4fef4bd731d 100644 > --- a/default-configs/devices/m68k-softmmu.mak > +++ b/default-configs/devices/m68k-softmmu.mak > @@ -1,7 +1,5 @@ > # Default configuration for m68k-softmmu > > -CONFIG_SEMIHOSTING=y > - > # Boards: > # > CONFIG_AN5206=y > diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak > index ea78fe72759..af652ec7bdd 100644 > --- a/default-configs/devices/mips-softmmu-common.mak > +++ b/default-configs/devices/mips-softmmu-common.mak > @@ -1,8 +1,5 @@ > # Common mips*-softmmu CONFIG defines > > -# CONFIG_SEMIHOSTING is always required on this architecture > -CONFIG_SEMIHOSTING=y > - > CONFIG_ISA_BUS=y > CONFIG_PCI=y > CONFIG_PCI_DEVICES=y > diff --git a/default-configs/devices/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak > index 1bc4082ea99..e130d024e62 100644 > --- a/default-configs/devices/nios2-softmmu.mak > +++ b/default-configs/devices/nios2-softmmu.mak > @@ -1,7 +1,5 @@ > # Default configuration for nios2-softmmu > > -CONFIG_SEMIHOSTING=y > - > # Boards: > # > CONFIG_NIOS2_10M50=y > diff --git a/default-configs/devices/unicore32-softmmu.mak b/default-configs/devices/unicore32-softmmu.mak > index 899288e3d71..0bfce48c6da 100644 > --- a/default-configs/devices/unicore32-softmmu.mak > +++ b/default-configs/devices/unicore32-softmmu.mak > @@ -3,4 +3,3 @@ > # Boards: > # > CONFIG_PUV3=y > -CONFIG_SEMIHOSTING=y > diff --git a/default-configs/devices/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak > index 4fe1bf00c94..49e4c9da88c 100644 > --- a/default-configs/devices/xtensa-softmmu.mak > +++ b/default-configs/devices/xtensa-softmmu.mak > @@ -1,7 +1,5 @@ > # Default configuration for Xtensa > > -CONFIG_SEMIHOSTING=y > - > # Boards: > # > CONFIG_XTENSA_SIM=y > diff --git a/target/lm32/Kconfig b/target/lm32/Kconfig > index 09de5b703a3..286710fd47b 100644 > --- a/target/lm32/Kconfig > +++ b/target/lm32/Kconfig > @@ -1,2 +1,3 @@ > config LM32 > bool > + select SEMIHOSTING > diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig > index 23debad519a..9eae71486ff 100644 > --- a/target/m68k/Kconfig > +++ b/target/m68k/Kconfig > @@ -1,2 +1,3 @@ > config M68K > bool > + select SEMIHOSTING > diff --git a/target/mips/Kconfig b/target/mips/Kconfig > index 6adf1453548..eb19c94c7d4 100644 > --- a/target/mips/Kconfig > +++ b/target/mips/Kconfig > @@ -1,5 +1,6 @@ > config MIPS > bool > + select SEMIHOSTING > > config MIPS64 > bool > diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig > index 1529ab8950d..c65550c861a 100644 > --- a/target/nios2/Kconfig > +++ b/target/nios2/Kconfig > @@ -1,2 +1,3 @@ > config NIOS2 > bool > + select SEMIHOSTING > diff --git a/target/unicore32/Kconfig b/target/unicore32/Kconfig > index 62c9d10b38f..c699d5238ea 100644 > --- a/target/unicore32/Kconfig > +++ b/target/unicore32/Kconfig > @@ -1,2 +1,3 @@ > config UNICORE32 > bool > + select SEMIHOSTING > diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig > index a3c8dc7f6d7..5e46049262d 100644 > --- a/target/xtensa/Kconfig > +++ b/target/xtensa/Kconfig > @@ -1,2 +1,3 @@ > config XTENSA > bool > + select SEMIHOSTING
diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak index 1bce3f6e8b6..1f69795b749 100644 --- a/default-configs/devices/lm32-softmmu.mak +++ b/default-configs/devices/lm32-softmmu.mak @@ -4,8 +4,6 @@ # #CONFIG_MILKYMIST_TMU2=n # disabling it actually causes compile-time failures -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_LM32_EVR=y diff --git a/default-configs/devices/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak index 6629fd2aa33..4fef4bd731d 100644 --- a/default-configs/devices/m68k-softmmu.mak +++ b/default-configs/devices/m68k-softmmu.mak @@ -1,7 +1,5 @@ # Default configuration for m68k-softmmu -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_AN5206=y diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak index ea78fe72759..af652ec7bdd 100644 --- a/default-configs/devices/mips-softmmu-common.mak +++ b/default-configs/devices/mips-softmmu-common.mak @@ -1,8 +1,5 @@ # Common mips*-softmmu CONFIG defines -# CONFIG_SEMIHOSTING is always required on this architecture -CONFIG_SEMIHOSTING=y - CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y diff --git a/default-configs/devices/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak index 1bc4082ea99..e130d024e62 100644 --- a/default-configs/devices/nios2-softmmu.mak +++ b/default-configs/devices/nios2-softmmu.mak @@ -1,7 +1,5 @@ # Default configuration for nios2-softmmu -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_NIOS2_10M50=y diff --git a/default-configs/devices/unicore32-softmmu.mak b/default-configs/devices/unicore32-softmmu.mak index 899288e3d71..0bfce48c6da 100644 --- a/default-configs/devices/unicore32-softmmu.mak +++ b/default-configs/devices/unicore32-softmmu.mak @@ -3,4 +3,3 @@ # Boards: # CONFIG_PUV3=y -CONFIG_SEMIHOSTING=y diff --git a/default-configs/devices/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak index 4fe1bf00c94..49e4c9da88c 100644 --- a/default-configs/devices/xtensa-softmmu.mak +++ b/default-configs/devices/xtensa-softmmu.mak @@ -1,7 +1,5 @@ # Default configuration for Xtensa -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_XTENSA_SIM=y diff --git a/target/lm32/Kconfig b/target/lm32/Kconfig index 09de5b703a3..286710fd47b 100644 --- a/target/lm32/Kconfig +++ b/target/lm32/Kconfig @@ -1,2 +1,3 @@ config LM32 bool + select SEMIHOSTING diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig index 23debad519a..9eae71486ff 100644 --- a/target/m68k/Kconfig +++ b/target/m68k/Kconfig @@ -1,2 +1,3 @@ config M68K bool + select SEMIHOSTING diff --git a/target/mips/Kconfig b/target/mips/Kconfig index 6adf1453548..eb19c94c7d4 100644 --- a/target/mips/Kconfig +++ b/target/mips/Kconfig @@ -1,5 +1,6 @@ config MIPS bool + select SEMIHOSTING config MIPS64 bool diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig index 1529ab8950d..c65550c861a 100644 --- a/target/nios2/Kconfig +++ b/target/nios2/Kconfig @@ -1,2 +1,3 @@ config NIOS2 bool + select SEMIHOSTING diff --git a/target/unicore32/Kconfig b/target/unicore32/Kconfig index 62c9d10b38f..c699d5238ea 100644 --- a/target/unicore32/Kconfig +++ b/target/unicore32/Kconfig @@ -1,2 +1,3 @@ config UNICORE32 bool + select SEMIHOSTING diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig index a3c8dc7f6d7..5e46049262d 100644 --- a/target/xtensa/Kconfig +++ b/target/xtensa/Kconfig @@ -1,2 +1,3 @@ config XTENSA bool + select SEMIHOSTING
SEMIHOSTING is an architecture feature, move its declaration to each target/ARCH/. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- default-configs/devices/lm32-softmmu.mak | 2 -- default-configs/devices/m68k-softmmu.mak | 2 -- default-configs/devices/mips-softmmu-common.mak | 3 --- default-configs/devices/nios2-softmmu.mak | 2 -- default-configs/devices/unicore32-softmmu.mak | 1 - default-configs/devices/xtensa-softmmu.mak | 2 -- target/lm32/Kconfig | 1 + target/m68k/Kconfig | 1 + target/mips/Kconfig | 1 + target/nios2/Kconfig | 1 + target/unicore32/Kconfig | 1 + target/xtensa/Kconfig | 1 + 12 files changed, 6 insertions(+), 12 deletions(-)