Re: [PATCH 1/1] pc-bios: add missing riscv64 descriptor

[Alistair Francis]

On Thu, Dec 12, 2024 at 7:01 PM Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> Without descriptor libvirt cannot discover the EDK II binaries via
> the qemu:///system connection.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  pc-bios/descriptors/60-edk2-riscv64.json | 31 ++++++++++++++++++++++++
>  pc-bios/descriptors/meson.build          |  3 ++-
>  2 files changed, 33 insertions(+), 1 deletion(-)
>  create mode 100644 pc-bios/descriptors/60-edk2-riscv64.json
>
> diff --git a/pc-bios/descriptors/60-edk2-riscv64.json 
> b/pc-bios/descriptors/60-edk2-riscv64.json
> new file mode 100644
> index 0000000000..14811ca307
> --- /dev/null
> +++ b/pc-bios/descriptors/60-edk2-riscv64.json
> @@ -0,0 +1,31 @@
> +{
> +    "description": "UEFI firmware for riscv64",
> +    "interface-types": [
> +        "uefi"
> +    ],
> +    "mapping": {
> +        "device": "flash",
> +        "executable": {
> +            "filename": "@DATADIR@/edk2-riscv-code.fd",
> +            "format": "raw"
> +        },
> +        "nvram-template": {
> +            "filename": "@DATADIR@/edk2-riscv-vars.fd",
> +            "format": "raw"
> +        }
> +    },
> +    "targets": [
> +        {
> +            "architecture": "riscv64",
> +            "machines": [
> +                "virt*"
> +            ]
> +        }
> +    ],
> +    "features": [
> +
> +    ],
> +    "tags": [
> +
> +    ]
> +}
> diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
> index afb5a959cc..cdd0be01a3 100644
> --- a/pc-bios/descriptors/meson.build
> +++ b/pc-bios/descriptors/meson.build
> @@ -6,7 +6,8 @@ if unpack_edk2_blobs and get_option('install_blobs')
>      '60-edk2-arm.json',
>      '60-edk2-i386.json',
>      '60-edk2-x86_64.json',
> -    '60-edk2-loongarch64.json'
> +    '60-edk2-loongarch64.json',
> +    '60-edk2-riscv64.json'
>    ]
>      configure_file(input: files(f),
>                     output: f,
> --
> 2.45.2
>
>