Commit e4e34855 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

hw/arm/boot: Use the IEC binary prefix definitions 



IEC binary prefixes ease code review: the unit is explicit.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190923131108.21459-1-philmd@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent ece628fc

hw/arm/boot.c

+5 −5
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
        goto fail;

    }



    if (scells < 2 && binfo->ram_size >= (1ULL << 32)) {

    if (scells < 2 && binfo->ram_size >= 4 * GiB) {

        /* This is user error so deserves a friendlier error message

         * than the failure of setprop_sized_cells would provide

         */
@@ -1097,7 +1097,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, 
     * we might still make a bad choice here.

     */

    info->initrd_start = info->loader_start +

        MIN(info->ram_size / 2, 128 * 1024 * 1024);

        MIN(info->ram_size / 2, 128 * MiB);

    if (image_high_addr) {

        info->initrd_start = MAX(info->initrd_start, image_high_addr);

    }
@@ -1157,13 +1157,13 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, 
                 *

                 * Let's play safe and prealign it to 2MB to give us some space.

                 */

                align = 2 * 1024 * 1024;

                align = 2 * MiB;

            } else {

                /*

                 * Some 32bit kernels will trash anything in the 4K page the

                 * initrd ends in, so make sure the DTB isn't caught up in that.

                 */

                align = 4096;

                align = 4 * KiB;

            }



            /* Place the DTB after the initrd in memory with alignment. */
@@ -1180,7 +1180,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, 
                info->loader_start + KERNEL_ARGS_ADDR;

            fixupcontext[FIXUP_ARGPTR_HI] =

                (info->loader_start + KERNEL_ARGS_ADDR) >> 32;

            if (info->ram_size >= (1ULL << 32)) {

            if (info->ram_size >= 4 * GiB) {

                error_report("RAM size must be less than 4GB to boot"

                             " Linux kernel using ATAGS (try passing a device tree"

                             " using -dtb)");