remove floppy driver number in load_image() parameters, add base offset to kernel image offset to find container if SCSI_SUPPORT

This commit is contained in:
Laurent Vivier 2004-12-03 00:16:30 +00:00
parent 4feec025f2
commit 5f3f4888ef

View File

@ -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);