X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fimage.c;h=0f88984f2d40212fe8bdafd124a8de97846cbc86;hb=e9eb0cb20a12f4ef55e229555efa6e726274dfdc;hp=8c35327745ba2f129b04c6a12403614e7632862e;hpb=516457013e5a88f65f9d6c11e9171cb03871cc92;p=oweals%2Fu-boot.git diff --git a/common/image.c b/common/image.c index 8c35327745..0f88984f2d 100644 --- a/common/image.c +++ b/common/image.c @@ -561,7 +561,7 @@ void genimg_print_size(uint32_t size) printf("%d Bytes = ", size); print_size(size, "\n"); #else - printf("%d Bytes = %.2f kB = %.2f MB\n", + printf("%d Bytes = %.2f KiB = %.2f MiB\n", size, (double)size / 1.024e3, (double)size / 1.048576e6); #endif @@ -1576,10 +1576,7 @@ int image_setup_linux(bootm_headers_t *images) { ulong of_size = images->ft_len; char **of_flat_tree = &images->ft_addr; - ulong *initrd_start = &images->initrd_start; - ulong *initrd_end = &images->initrd_end; struct lmb *lmb = &images->lmb; - ulong rd_len; int ret; if (IMAGE_ENABLE_OF_LIBFDT) @@ -1593,13 +1590,6 @@ int image_setup_linux(bootm_headers_t *images) return ret; } } - if (IMAGE_ENABLE_RAMDISK_HIGH) { - rd_len = images->rd_end - images->rd_start; - ret = boot_ramdisk_high(lmb, images->rd_start, rd_len, - initrd_start, initrd_end); - if (ret) - return ret; - } if (IMAGE_ENABLE_OF_LIBFDT) { ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size);