| Message ID | 20210513163858.3928976-11-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw: Various Kconfig fixes | expand |
Cc Alex & Thomas On 5/13/21 6:38 PM, Philippe Mathieu-Daudé wrote: > ARM_COMPATIBLE_SEMIHOSTING is not optional on these targets. > Move the variable assignment out of the block documented with > "Uncomment the following lines to disable these optional devices". > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/devices/arm-softmmu.mak | 4 +++- > default-configs/devices/riscv32-softmmu.mak | 4 +++- > default-configs/devices/riscv64-softmmu.mak | 4 +++- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak > index 341d439de6f..2713e5e9eb7 100644 > --- a/default-configs/devices/arm-softmmu.mak > +++ b/default-configs/devices/arm-softmmu.mak > @@ -1,5 +1,8 @@ > # Default configuration for arm-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # TODO: ARM_V7M is currently always required - make this more flexible! > CONFIG_ARM_V7M=y > > @@ -41,5 +44,4 @@ CONFIG_MICROBIT=y > CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > CONFIG_ALLWINNER_H3=y > diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak > index 5c9ad2590ef..7219f9749ad 100644 > --- a/default-configs/devices/riscv32-softmmu.mak > +++ b/default-configs/devices/riscv32-softmmu.mak > @@ -1,9 +1,11 @@ > # Default configuration for riscv32-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # Uncomment the following lines to disable these optional devices: > # > #CONFIG_PCI_DEVICES=n > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > > # Boards: > # > diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak > index 8a92f0a2c74..1d1b8bb9f68 100644 > --- a/default-configs/devices/riscv64-softmmu.mak > +++ b/default-configs/devices/riscv64-softmmu.mak > @@ -1,9 +1,11 @@ > # Default configuration for riscv64-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # Uncomment the following lines to disable these optional devices: > # > #CONFIG_PCI_DEVICES=n > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > > # Boards: > # >
On 13/05/21 18:38, Philippe Mathieu-Daudé wrote: > ARM_COMPATIBLE_SEMIHOSTING is not optional on these targets. > Move the variable assignment out of the block documented with > "Uncomment the following lines to disable these optional devices". Can you document why it is always required in the commit message? I suppose you cannot move it to default-configs/targets/ because you want to have CONFIG_SEMIHOSTING selected automatically (patch 9). Paolo > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/devices/arm-softmmu.mak | 4 +++- > default-configs/devices/riscv32-softmmu.mak | 4 +++- > default-configs/devices/riscv64-softmmu.mak | 4 +++- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak > index 341d439de6f..2713e5e9eb7 100644 > --- a/default-configs/devices/arm-softmmu.mak > +++ b/default-configs/devices/arm-softmmu.mak > @@ -1,5 +1,8 @@ > # Default configuration for arm-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # TODO: ARM_V7M is currently always required - make this more flexible! > CONFIG_ARM_V7M=y > > @@ -41,5 +44,4 @@ CONFIG_MICROBIT=y > CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > CONFIG_ALLWINNER_H3=y > diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak > index 5c9ad2590ef..7219f9749ad 100644 > --- a/default-configs/devices/riscv32-softmmu.mak > +++ b/default-configs/devices/riscv32-softmmu.mak > @@ -1,9 +1,11 @@ > # Default configuration for riscv32-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # Uncomment the following lines to disable these optional devices: > # > #CONFIG_PCI_DEVICES=n > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > > # Boards: > # > diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak > index 8a92f0a2c74..1d1b8bb9f68 100644 > --- a/default-configs/devices/riscv64-softmmu.mak > +++ b/default-configs/devices/riscv64-softmmu.mak > @@ -1,9 +1,11 @@ > # Default configuration for riscv64-softmmu > > +# TODO: semihosting is always required - move to default-configs/targets/ > +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > + > # Uncomment the following lines to disable these optional devices: > # > #CONFIG_PCI_DEVICES=n > -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y > > # Boards: > # >
On 5/13/21 7:58 PM, Paolo Bonzini wrote: > On 13/05/21 18:38, Philippe Mathieu-Daudé wrote: >> ARM_COMPATIBLE_SEMIHOSTING is not optional on these targets. >> Move the variable assignment out of the block documented with >> "Uncomment the following lines to disable these optional devices". > > Can you document why it is always required in the commit message? OK, basically SEMIHOSTING is not a device but an architectural thing. Maybe we are mixing various things, like a semihosting console (yes, a device) and the architectural part, I will discuss that with Alex. > I suppose you cannot move it to default-configs/targets/ because you > want to have CONFIG_SEMIHOSTING selected automatically (patch 9). That and other things. This is annoying me since more than 1 year. I'm waiting Claudio's ARM KVM/TCG series get merged before getting my hands dirty with meson.build. Let's postpone this patch (and the previous one) for now. Thanks for the review, Phil.
diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak index 341d439de6f..2713e5e9eb7 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -1,5 +1,8 @@ # Default configuration for arm-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y @@ -41,5 +44,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak index 5c9ad2590ef..7219f9749ad 100644 --- a/default-configs/devices/riscv32-softmmu.mak +++ b/default-configs/devices/riscv32-softmmu.mak @@ -1,9 +1,11 @@ # Default configuration for riscv32-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak index 8a92f0a2c74..1d1b8bb9f68 100644 --- a/default-configs/devices/riscv64-softmmu.mak +++ b/default-configs/devices/riscv64-softmmu.mak @@ -1,9 +1,11 @@ # Default configuration for riscv64-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: #
ARM_COMPATIBLE_SEMIHOSTING is not optional on these targets. Move the variable assignment out of the block documented with "Uncomment the following lines to disable these optional devices". Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/devices/arm-softmmu.mak | 4 +++- default-configs/devices/riscv32-softmmu.mak | 4 +++- default-configs/devices/riscv64-softmmu.mak | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-)