From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBML4-000394-9v for qemu-devel@nongnu.org; Mon, 28 Nov 2016 08:51:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBML3-0004fG-Fz for qemu-devel@nongnu.org; Mon, 28 Nov 2016 08:51:22 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:47594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cBML3-0004au-8o for qemu-devel@nongnu.org; Mon, 28 Nov 2016 08:51:21 -0500 From: Peter Maydell Date: Mon, 28 Nov 2016 13:51:11 +0000 Message-Id: <1480341071-5367-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1480341071-5367-1-git-send-email-peter.maydell@linaro.org> References: <1480341071-5367-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 2/2] arm: Create /chosen and /memory devicetree nodes if necessary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi From: Guenter Roeck While customary, the /chosen and /memory devicetree nodes do not have to exist. Create if necessary. Also create the /memory/device_type property if needed. Signed-off-by: Guenter Roeck Message-id: 1479346221-18474-1-git-send-email-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/boot.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 942416d..ff621e4 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include #include "hw/hw.h" #include "hw/arm/arm.h" #include "hw/arm/linux-boot-if.h" @@ -486,6 +487,17 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, g_free(nodename); } } else { + Error *err = NULL; + + rc = fdt_path_offset(fdt, "/memory"); + if (rc < 0) { + qemu_fdt_add_subnode(fdt, "/memory"); + } + + if (!qemu_fdt_getprop(fdt, "/memory", "device_type", NULL, &err)) { + qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory"); + } + rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg", acells, binfo->loader_start, scells, binfo->ram_size); @@ -495,6 +507,11 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } } + rc = fdt_path_offset(fdt, "/chosen"); + if (rc < 0) { + qemu_fdt_add_subnode(fdt, "/chosen"); + } + if (binfo->kernel_cmdline && *binfo->kernel_cmdline) { rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", binfo->kernel_cmdline); -- 2.7.4