Commit f831f955 authored by Nick Hudson's avatar Nick Hudson Committed by Peter Maydell
Browse files

Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel. 



noload kernels are loaded with the u-boot image header and as a result
the header size needs adding to the entry point.  Fake up a hdr so the
kernel image is loaded at the right address and the entry point is
adjusted appropriately.

The default location for the uboot file is 32MiB above bottom of DRAM.
This matches the recommendation in Documentation/arm/Booting.

Clarify the load_uimage API to state the passing of a load address when an
image doesn't specify one, or when loading a ramdisk is expected.

Adjust callers of load_uimage, etc.

Signed-off-by: default avatarNick Hudson <skrll@netbsd.org>
Message-id: 11488a08-1fe0-a278-2210-deb64731107f@gmx.co.uk
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 619d54a8

hw/arm/boot.c

+5 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 * They have different preferred image load offsets from system RAM base.

 */

#define KERNEL_ARGS_ADDR   0x100

#define KERNEL_NOLOAD_ADDR 0x02000000

#define KERNEL_LOAD_ADDR   0x00010000

#define KERNEL64_LOAD_ADDR 0x00080000
@@ -1082,7 +1083,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
    }

    entry = elf_entry;

    if (kernel_size < 0) {

        kernel_size = load_uimage_as(info->kernel_filename, &entry, NULL,

        uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR;

        kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr,

                                     &is_linux, NULL, NULL, as);

    }

    if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {

hw/core/loader.c

+16 −3
Original line number Diff line number Diff line
@@ -613,13 +613,26 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, 
        goto out;



    if (hdr->ih_type != image_type) {

        if (!(image_type == IH_TYPE_KERNEL &&

            hdr->ih_type == IH_TYPE_KERNEL_NOLOAD)) {

            fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type,

                    image_type);

            goto out;

        }

    }



    /* TODO: Implement other image types.  */

    switch (hdr->ih_type) {

    case IH_TYPE_KERNEL_NOLOAD:

        if (!loadaddr || *loadaddr == LOAD_UIMAGE_LOADADDR_INVALID) {

            fprintf(stderr, "this image format (kernel_noload) cannot be "

                    "loaded on this machine type");

            goto out;

        }



        hdr->ih_load = *loadaddr + sizeof(*hdr);

        hdr->ih_ep += hdr->ih_load;

        /* fall through */

    case IH_TYPE_KERNEL:

        address = hdr->ih_load;

        if (translate_fn) {

hw/core/uboot_image.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
#define IH_TYPE_SCRIPT		6	/* Script file			*/

#define IH_TYPE_FILESYSTEM	7	/* Filesystem Image (any type)	*/

#define IH_TYPE_FLATDT		8	/* Binary Flat Device Tree Blob	*/

#define IH_TYPE_KERNEL_NOLOAD  14	/* OS Kernel Image (noload)	*/



/*

 * Compression Types

hw/microblaze/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, 


        /* If it wasn't an ELF image, try an u-boot image.  */

        if (kernel_size < 0) {

            hwaddr uentry, loadaddr;

            hwaddr uentry, loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;



            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0,

                                      NULL, NULL);

hw/nios2/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, 


        /* If it wasn't an ELF image, try an u-boot image. */

        if (kernel_size < 0) {

            hwaddr uentry, loadaddr;

            hwaddr uentry, loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;



            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0,

                                      NULL, NULL);