Commit d5fef92f authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/boot: Rename elf_{low, high}_addr to image_{low, high}_addr 



Rename the elf_low_addr and elf_high_addr variables to image_low_addr
and image_high_addr -- in the next commit we will extend them to
be set for other kinds of image file and not just ELF files.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Message-id: 20190722151804.25467-2-peter.maydell@linaro.org
parent 0c413ba0

hw/arm/boot.c

+11 −9
Original line number Diff line number Diff line
@@ -986,7 +986,9 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, 
    int kernel_size;

    int initrd_size;

    int is_linux = 0;

    uint64_t elf_entry, elf_low_addr, elf_high_addr;

    uint64_t elf_entry;

    /* Addresses of first byte used and first byte not used by the image */

    uint64_t image_low_addr, image_high_addr;

    int elf_machine;

    hwaddr entry;

    static const ARMInsnFixup *primary_loader;
@@ -1014,24 +1016,24 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, 
        info->nb_cpus = 1;



    /* Assume that raw images are linux kernels, and ELF images are not.  */

    kernel_size = arm_load_elf(info, &elf_entry, &elf_low_addr,

                               &elf_high_addr, elf_machine, as);

    kernel_size = arm_load_elf(info, &elf_entry, &image_low_addr,

                               &image_high_addr, elf_machine, as);

    if (kernel_size > 0 && have_dtb(info)) {

        /*

         * If there is still some room left at the base of RAM, try and put

         * the DTB there like we do for images loaded with -bios or -pflash.

         */

        if (elf_low_addr > info->loader_start

            || elf_high_addr < info->loader_start) {

        if (image_low_addr > info->loader_start

            || image_high_addr < info->loader_start) {

            /*

             * Set elf_low_addr as address limit for arm_load_dtb if it may be

             * Set image_low_addr as address limit for arm_load_dtb if it may be

             * pointing into RAM, otherwise pass '0' (no limit)

             */

            if (elf_low_addr < info->loader_start) {

                elf_low_addr = 0;

            if (image_low_addr < info->loader_start) {

                image_low_addr = 0;

            }

            info->dtb_start = info->loader_start;

            info->dtb_limit = elf_low_addr;

            info->dtb_limit = image_low_addr;

        }

    }

    entry = elf_entry;