[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 03/14] hw/nios2: set machine->fdt in nios2_load_dtb()
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v5 03/14] hw/nios2: set machine->fdt in nios2_load_dtb() |
Date: |
Sat, 3 Sep 2022 16:34:09 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for all nios2
machines that uses nios2_load_dtb().
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/nios2/boot.c | 8 +++++++-
hw/nios2/meson.build | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 21cbffff47..b30a7b1efb 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -43,6 +43,8 @@
#include "boot.h"
+#include <libfdt.h>
+
#define NIOS2_MAGIC 0x534f494e
static struct nios2_boot_info {
@@ -81,6 +83,7 @@ static uint64_t translate_kernel_address(void *opaque,
uint64_t addr)
static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize,
const char *kernel_cmdline, const char *dtb_filename)
{
+ MachineState *machine = MACHINE(qdev_get_machine());
int fdt_size;
void *fdt = NULL;
int r;
@@ -113,7 +116,10 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const
uint32_t ramsize,
}
cpu_physical_memory_write(bi.fdt, fdt, fdt_size);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return fdt_size;
}
diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build
index 6c58e8082b..22277bd6c5 100644
--- a/hw/nios2/meson.build
+++ b/hw/nios2/meson.build
@@ -1,5 +1,5 @@
nios2_ss = ss.source_set()
-nios2_ss.add(files('boot.c'))
+nios2_ss.add(files('boot.c'), fdt)
nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c'))
nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true:
files('generic_nommu.c'))
--
2.37.2
- [PATCH v5 00/14] QMP/HMP: introduce 'dumpdtb', Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 01/14] hw/arm: do not free machine->fdt in arm_load_dtb(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 02/14] hw/microblaze: set machine->fdt in microblaze_load_dtb(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 03/14] hw/nios2: set machine->fdt in nios2_load_dtb(),
Daniel Henrique Barboza <=
- [PATCH v5 04/14] hw/ppc: set machine->fdt in ppce500_load_device_tree(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 05/14] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 06/14] hw/ppc: set machine->fdt in sam460ex_load_device_tree(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 07/14] hw/ppc: set machine->fdt in xilinx_load_device_tree(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 08/14] hw/ppc: set machine->fdt in pegasos2_machine_reset(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 09/14] hw/ppc: set machine->fdt in pnv_reset(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 10/14] hw/ppc: set machine->fdt in spapr machine, Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 11/14] hw/riscv: set machine->fdt in sifive_u_machine_init(), Daniel Henrique Barboza, 2022/09/03
- [PATCH v5 12/14] hw/riscv: set machine->fdt in spike_board_init(), Daniel Henrique Barboza, 2022/09/03