Commit b77257d7 authored by Guenter Roeck's avatar Guenter Roeck Committed by Peter Maydell
Browse files

arm: Create /chosen and /memory devicetree nodes if necessary 



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: default avatarGuenter Roeck <linux@roeck-us.net>
Message-id: 1479346221-18474-1-git-send-email-linux@roeck-us.net
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 6aa3a616

hw/arm/boot.c

+17 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "qemu/osdep.h"

#include "qapi/error.h"

#include <libfdt.h>

#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);