diff options
| author | Jerome Forissier <jerome@forissier.org> | 2020-04-20 14:18:06 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-30 15:35:41 +0100 |
| commit | ef6a5c71c2f40e253712ad3d8826d5e84e325aeb (patch) | |
| tree | 7afbae656227481c495c91d57385bfcfabc88f05 | |
| parent | 6b375d3546b009d1e63e07397ec9c6af256e15e9 (diff) | |
| download | qemu-ef6a5c71c2f40e253712ad3d8826d5e84e325aeb.zip | |
hw/arm/virt: dt: move creation of /secure-chosen to create_fdt()
The /secure-chosen node is currently used only by create_uart(), but
this will change. Therefore move the creation of this node to
create_fdt().
Signed-off-by: Jerome Forissier <jerome@forissier.org>
Message-id: 20200420121807.8204-2-jerome@forissier.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/arm/virt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index cca5316256..0d92674f32 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -234,6 +234,10 @@ static void create_fdt(VirtMachineState *vms) /* /chosen must exist for load_dtb to fill in necessary properties later */ qemu_fdt_add_subnode(fdt, "/chosen"); + if (vms->secure) { + qemu_fdt_add_subnode(fdt, "/secure-chosen"); + } + /* Clock node, for the benefit of the UART. The kernel device tree * binding documentation claims the PL011 node clock properties are * optional but in practice if you omit them the kernel refuses to @@ -761,7 +765,6 @@ static void create_uart(const VirtMachineState *vms, int uart, qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled"); qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay"); - qemu_fdt_add_subnode(vms->fdt, "/secure-chosen"); qemu_fdt_setprop_string(vms->fdt, "/secure-chosen", "stdout-path", nodename); } |