[PATCH-for-5.2 v3] hw/mips: Remove the 'r4k' machine

[Philippe Mathieu-Daudé]

On 11/3/20 7:58 AM, Thomas Huth wrote:
> On 02/11/2020 21.13, Philippe Mathieu-Daudé wrote:
>> We deprecated the support for the 'r4k' machine for the 5.0 release
>> (commit d32dc61421), which means that our deprecation policy allows
>> us to drop it in release 5.2. Remove the code.
>>
>> To repeat the rationale from the deprecation note:
>> - this virtual machine has no specification
>> - the Linux kernel dropped support for it 10 years ago
>>
>> Users are recommended to use the Malta board instead.
>>
>> Acked-by: Richard Henderson <richard.henderson at linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug at amsat.org>
>> ---
>> v3: Move to "Recently removed features" section
>> ---
>>  docs/system/deprecated.rst                    |  12 +-
>>  .../devices/mips-softmmu-common.mak           |   1 -
>>  hw/mips/r4k.c                                 | 318 ------------------
>>  MAINTAINERS                                   |   6 -
>>  hw/mips/Kconfig                               |  13 -
>>  hw/mips/meson.build                           |   1 -
>>  6 files changed, 6 insertions(+), 345 deletions(-)
>>  delete mode 100644 hw/mips/r4k.c
>>
>> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
>> index 0ebce37a191..e5b7cf274d3 100644
>> --- a/docs/system/deprecated.rst
>> +++ b/docs/system/deprecated.rst
>> @@ -327,12 +327,6 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
>>  System emulator machines
>>  ------------------------
>>  
>> -mips ``r4k`` platform (since 5.0)
>> -'''''''''''''''''''''''''''''''''
>> -
>> -This machine type is very old and unmaintained. Users should use the ``malta``
>> -machine type instead.
>> -
>>  mips ``fulong2e`` machine (since 5.1)
>>  '''''''''''''''''''''''''''''''''''''
>>  
>> @@ -575,6 +569,12 @@ The version specific Spike machines have been removed in favour of the
>>  generic ``spike`` machine. If you need to specify an older version of the RISC-V
>>  spec you can use the ``-cpu rv64gcsu,priv_spec=v1.10.0`` command line argument.
>>  
>> +mips ``r4k`` platform (removed in 5.2)
>> +''''''''''''''''''''''''''''''''''''''
>> +
>> +This machine type is very old and unmaintained. Users should use the ``malta``
>> +machine type instead.
> 
> Ah, just spotted this v3 - that's better now indeed :-)
> Maybe change "is very old" into "was very old"?

OK.

> 
> Anyway:
> Reviewed-by: Thomas Huth <thuth at redhat.com>

Thanks!