From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEk-0003mv-I8 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 1XPvEe-0002kp-Km for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:42 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:55423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEe-0002kf-F2 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:36 -0400 Received: by mail-we0-f178.google.com with SMTP id q58so426019wes.37 for ; Fri, 05 Sep 2014 08:15:32 -0700 (PDT) From: Ard Biesheuvel Date: Fri, 5 Sep 2014 17:15:26 +0200 Message-Id: <1409930126-28449-7-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 6/6] hw/arm/boot: enable DTB support when booting ELF images 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 Add support for loading DTB images when booting ELF images via -kernel. The DTB image is located at the next 4 KB boundary above the highest address covered by the loaded ELF image. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 8d8653978dfe..60c4f6af7884 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -458,7 +458,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) int kernel_size; int initrd_size; int is_linux = 0; - uint64_t elf_entry; + uint64_t elf_entry, elf_low_addr; int elf_machine; hwaddr entry, kernel_load_offset; int big_endian; @@ -529,7 +529,21 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Assume that raw images are linux kernels, and ELF images are not. */ kernel_size = load_elf(info->kernel_filename, NULL, NULL, &elf_entry, - NULL, NULL, big_endian, elf_machine, 1); + &elf_low_addr, NULL, big_endian, elf_machine, 1); + if (kernel_size > 0 && have_dtb(info)) { + /* If we have a DTB in combination with an ELF executable image, + * put the DTB at the base of RAM like we do for bootloaders. + */ + uint32_t dtb_size; + + if (load_dtb(info->loader_start, info, &dtb_size)) { + exit(1); + } + if (info->loader_start + dtb_size > elf_low_addr) { + fprintf(stderr, "Image %s overlaps DTB\n", info->kernel_filename); + exit(1); + } + } entry = elf_entry; if (kernel_size < 0) { kernel_size = load_uimage(info->kernel_filename, &entry, NULL, -- 1.8.3.2