From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfdF-00077i-NC for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRfd8-0003Go-Bb for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:13 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:33794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfd7-0003Dn-Sj for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:06 -0400 Received: by mail-we0-f169.google.com with SMTP id w61so3577824wes.0 for ; Wed, 10 Sep 2014 04:00:05 -0700 (PDT) From: Ard Biesheuvel Date: Wed, 10 Sep 2014 12:59:50 +0200 Message-Id: <1410346790-31743-5-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 4/4] 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: christoffer.dall@linaro.org, Ard Biesheuvel Add support for loading DTB images when booting ELF images using -kernel. If there are no conflicts with the placement of the ELF segments, the DTB image is loaded at the base of RAM. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1f73614d8843..3878cbd97aad 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -464,7 +464,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; @@ -531,7 +531,19 @@ 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 there is still some room left between the base of RAM and the + * low end of the ELF image we just loaded, try and put the DTB at the + * base of RAM like we do for bootloaders. Just ignore the potential 0 + * return value of load_dtb() which indicates that the dtb didn't fit, + * in that case we just proceed without it. + */ + if (elf_low_addr > info->loader_start && + load_dtb(info->loader_start, info, elf_low_addr) < 0) { + exit(1); + } + } entry = elf_entry; if (kernel_size < 0) { kernel_size = load_uimage(info->kernel_filename, &entry, NULL, -- 1.8.3.2