From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEl-0003mx-4Q for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEf-0002l2-5u for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:43 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:54912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEe-0002ki-K2 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:36 -0400 Received: by mail-we0-f171.google.com with SMTP id u56so11991736wes.30 for ; Fri, 05 Sep 2014 08:15:33 -0700 (PDT) From: Ard Biesheuvel Date: Fri, 5 Sep 2014 17:15:25 +0200 Message-Id: <1409930126-28449-6-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Qemu-devel] [PATCH 5/6] 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: fu.wei@linaro.org, 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. 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 0cfc11d42962..8d8653978dfe 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -400,7 +400,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