From 5f3f4888ef9a1bd89476b5e2a9127df9e0458b64 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 3 Dec 2004 00:16:30 +0000 Subject: [PATCH] remove floppy driver number in load_image() parameters, add base offset to kernel image offset to find container if SCSI_SUPPORT --- second/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/second/main.c b/second/main.c index 898a363..7b05eaf 100644 --- a/second/main.c +++ b/second/main.c @@ -78,7 +78,10 @@ int start(emile_l2_header_t* info) printf("vmlinux %s\n", info->command_line); printf("Loading kernel...\n"); - kernel_image_start = (unsigned long)load_image(1, +#ifdef SCSI_SUPPORT + info->kernel_image_offset = (unsigned long)info->kernel_image_offset + (unsigned long)info; +#endif + kernel_image_start = (unsigned long)load_image( (unsigned long)info->kernel_image_offset, info->kernel_image_size); printf("Kernel image loaded at 0x%lx\n", kernel_image_start); @@ -154,7 +157,7 @@ int start(emile_l2_header_t* info) if (info->ramdisk_size != 0) { printf("Loading RAMDISK...\n"); - ramdisk_start = (unsigned long)load_image(1, + ramdisk_start = (unsigned long)load_image( (unsigned long)info->ramdisk_offset, info->ramdisk_size); printf("RAMDISK loaded at 0x%lx\n", ramdisk_start);