Re: [PATCH v2 2/2] hw/mips: Add MIPS virt board

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 6/3/23 17:42, Philippe Mathieu-Daudé wrote:
> On 4/3/23 23:38, Jiaxun Yang wrote:
>> MIPS virt board is design to utilize existing VirtIO infrastures
>> but also comptitable with MIPS's existing internal simulation tools.
>>
>> It includes virtio-pci, virtio-mmio, pcie gpex, flash rom, fw_cfg,
>> goldfish-rtc and MIPS CPS system.
>>
>> It should be able to cooperate with any MIPS CPU cores.
>>
>> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
>> ---
>> v1:
>>   - Rename to virt board
>>   - Convert BIOS flash to ROM
>>   - Cleanups
>> v2:
>>   - Fix fdt flash
>>   - Remove UP variant
>> ---
>>   MAINTAINERS                             |   7 +
>>   configs/devices/mips-softmmu/common.mak |   1 +
>>   docs/system/target-mips.rst             |  22 +
>>   hw/mips/Kconfig                         |  17 +
>>   hw/mips/meson.build                     |   1 +
>>   hw/mips/virt.c                          | 916 ++++++++++++++++++++++++
>>   6 files changed, 964 insertions(+)
>>   create mode 100644 hw/mips/virt.c


>> +#include "qom/object.h"
>> +#include <libfdt.h>
>> +
>> +#define TYPE_MIPS_VIRT_MACHINE MACHINE_TYPE_NAME("virt")
> 
> So now every variant requires libfdt available on the host,
> otherwise building with --target-list=mips-softmmu,mipsel-softmmu
> on a host without libfdt:
> 
> ../../hw/mips/virt.c:47:10: fatal error: 'libfdt.h' file not found
> #include <libfdt.h>
>           ^~~~~~~~~~
> 
> So we can use:
> -- >8 --
> diff --git a/configs/targets/mips-softmmu.mak 
> b/configs/targets/mips-softmmu.mak
> index 7787a4d94c..a5c1db82c9 100644
> --- a/configs/targets/mips-softmmu.mak
> +++ b/configs/targets/mips-softmmu.mak
> @@ -2,3 +2,4 @@ TARGET_ARCH=mips
>   TARGET_ALIGNED_ONLY=y
>   TARGET_BIG_ENDIAN=y
>   TARGET_SUPPORTS_MTTCG=y
> +TARGET_NEED_FDT=y
> diff --git a/configs/targets/mips64-softmmu.mak 
> b/configs/targets/mips64-softmmu.mak
> index 568d66650c..398e0fc244 100644
> --- a/configs/targets/mips64-softmmu.mak
> +++ b/configs/targets/mips64-softmmu.mak
> @@ -2,3 +2,4 @@ TARGET_ARCH=mips64
>   TARGET_BASE_ARCH=mips
>   TARGET_ALIGNED_ONLY=y
>   TARGET_BIG_ENDIAN=y
> +TARGET_NEED_FDT=y
> diff --git a/configs/targets/mipsel-softmmu.mak 
> b/configs/targets/mipsel-softmmu.mak
> index c7c41f4fb7..3ddebca575 100644
> --- a/configs/targets/mipsel-softmmu.mak
> +++ b/configs/targets/mipsel-softmmu.mak
> @@ -1,3 +1,4 @@
>   TARGET_ARCH=mips
>   TARGET_ALIGNED_ONLY=y
>   TARGET_SUPPORTS_MTTCG=y
> +TARGET_NEED_FDT=y
> ---

Also missing (to get libfdt include path added to CPPFLAGS):

-- >8 --
diff --git a/hw/mips/meson.build b/hw/mips/meson.build
index 5670c939fa..a5a6c64a06 100644
--- a/hw/mips/meson.build
+++ b/hw/mips/meson.build
@@ -3,3 +3,3 @@ mips_ss.add(files('bootloader.c', 'mips_int.c'))
  mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c'))
-mips_ss.add(when: 'CONFIG_MIPS_VIRT', if_true: files('virt.c'))
+mips_ss.add(when: 'CONFIG_MIPS_VIRT', if_true: [files('virt.c'), fdt])
  mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: 
files('loongson3_bootp.c', 'loongson3_virt.c'))
---