[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 02/14] hw/microblaze: set machine->fdt in microblaze_load_dtb(
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v7 02/14] hw/microblaze: set machine->fdt in microblaze_load_dtb() |
Date: |
Thu, 8 Sep 2022 16:40:28 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for all
microblaze machines that uses microblaze_load_dtb().
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/microblaze/boot.c | 8 +++++++-
hw/microblaze/meson.build | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 8b92a9801a..c8eff7b6fc 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -39,6 +39,8 @@
#include "boot.h"
+#include <libfdt.h>
+
static struct
{
void (*machine_cpu_reset)(MicroBlazeCPU *);
@@ -72,6 +74,7 @@ static int microblaze_load_dtb(hwaddr addr,
const char *kernel_cmdline,
const char *dtb_filename)
{
+ MachineState *machine = MACHINE(qdev_get_machine());
int fdt_size;
void *fdt = NULL;
int r;
@@ -100,7 +103,10 @@ static int microblaze_load_dtb(hwaddr addr,
}
cpu_physical_memory_write(addr, fdt, fdt_size);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return fdt_size;
}
diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build
index bb9e4eb8f4..a38a397872 100644
--- a/hw/microblaze/meson.build
+++ b/hw/microblaze/meson.build
@@ -1,5 +1,5 @@
microblaze_ss = ss.source_set()
-microblaze_ss.add(files('boot.c'))
+microblaze_ss.add(files('boot.c'), fdt)
microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true:
files('petalogix_s3adsp1800_mmu.c'))
microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true:
files('petalogix_ml605_mmu.c'))
microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true:
files('xlnx-zynqmp-pmu.c'))
--
2.37.2
- [PATCH v7 00/14] QMP/HMP: introduce 'dumpdtb', Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 01/14] hw/arm: do not free machine->fdt in arm_load_dtb(), Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 02/14] hw/microblaze: set machine->fdt in microblaze_load_dtb(),
Daniel Henrique Barboza <=
- [PATCH v7 03/14] hw/nios2: set machine->fdt in nios2_load_dtb(), Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 04/14] hw/ppc: set machine->fdt in ppce500_load_device_tree(), Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 05/14] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 06/14] hw/ppc: set machine->fdt in sam460ex_load_device_tree(), Daniel Henrique Barboza, 2022/09/08
- [PATCH v7 07/14] hw/ppc: set machine->fdt in xilinx_load_device_tree(), Daniel Henrique Barboza, 2022/09/08