From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfdB-0006yS-5C for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRfd4-00035q-7P for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:09 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:50426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfd4-00034s-29 for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:02 -0400 Received: by mail-we0-f175.google.com with SMTP id w61so3553963wes.20 for ; Wed, 10 Sep 2014 04:00:01 -0700 (PDT) From: Ard Biesheuvel Date: Wed, 10 Sep 2014 12:59:47 +0200 Message-Id: <1410346790-31743-2-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1410346790-31743-1-git-send-email-ard.biesheuvel@linaro.org> References: <1410346790-31743-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Qemu-devel] [PATCH v2 1/4] hw/arm/boot: load DTB as a ROM image List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: christoffer.dall@linaro.org, Ard Biesheuvel In order to make the device tree blob (DTB) available in memory not only at first boot, but also after system reset, use rom_blob_add_fixed() to install it into memory. Reviewed-by: Peter Maydell Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e32f2f415885..50eca931e1a4 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -396,7 +396,10 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) qemu_fdt_dumpdtb(fdt, size); - cpu_physical_memory_write(addr, fdt, size); + /* Put the DTB into the memory map as a ROM image: this will ensure + * the DTB is copied again upon reset, even if addr points into RAM. + */ + rom_add_blob_fixed("dtb", fdt, size, addr); g_free(fdt); -- 1.8.3.2