Commit 872a91b4 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias
Browse files

xilinx-s3adsp: Add support for loading u-boot images.

parent 811976dc
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -179,8 +179,18 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
        }
        /* Always boot into physical ram.  */
        boot_info.bootstrap_pc = ddr_base + (entry & 0x0fffffff);

        /* If it wasn't an ELF image, try an u-boot image.  */
        if (kernel_size < 0) {
            target_phys_addr_t uentry, loadaddr;

            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0);
            boot_info.bootstrap_pc = uentry;
            high = (loadaddr + kernel_size + 3) & ~3;
        }

        /* Not an ELF image nor an u-boot image, try a RAW image.  */
        if (kernel_size < 0) {
            /* If we failed loading ELF's try a raw image.  */
            kernel_size = load_image_targphys(kernel_filename, ddr_base,
                                              ram_size);
            boot_info.bootstrap_pc = ddr_base;