Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-10-10 16:23:42 +00:00
Code Issues Projects Releases Wiki Activity

take kernel size from uncompress(), because _kernel_size from head.S is in fact a buffer size

Browse Source
This commit is contained in:
Laurent Vivier 2004-06-03 08:16:38 +00:00
parent ac8cf01ea2
commit ceb9864aed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
second/main.c
View File

@ -44,6 +44,7 @@ int main(int argc, char** argv)
{ {
unsigned long kernel_image_start; unsigned long kernel_image_start;
unsigned long ramdisk_start; unsigned long ramdisk_start;
unsigned long kernel_size;
#ifdef TARGET_M68K #ifdef TARGET_M68K
char * kernel; char * kernel;
@ -118,7 +119,7 @@ int main(int argc, char** argv)
/* align kernel address to a 4 byte word */ /* align kernel address to a 4 byte word */
kernel = (unsigned char*)(((unsigned long)kernel + 3) & 0xFFFFFFFC); kernel = (unsigned char*)(((unsigned long)kernel + 3) & 0xFFFFFFFC);
uncompress(kernel, (char*)kernel_image_start); kernel_size = uncompress(kernel, (char*)kernel_image_start);
printf("\n"); printf("\n");
} }
else else
@ -164,7 +165,7 @@ int main(int argc, char** argv)
/* set bootinfo at end of kernel image */ /* set bootinfo at end of kernel image */
bootinfo_init((char*)ramdisk_start, _ramdisk_size); bootinfo_init((char*)ramdisk_start, _ramdisk_size);
set_kernel_bootinfo(kernel + _kernel_size); set_kernel_bootinfo(kernel + kernel_size);
/* disable interrupt */ /* disable interrupt */
@ -208,7 +209,7 @@ int main(int argc, char** argv)
printf("\n"); printf("\n");
printf("Physical address of kernel will be 0x%08lx\n", start_mem); printf("Physical address of kernel will be 0x%08lx\n", start_mem);
printf("Ok, booting the kernel.\n"); printf("Ok, booting the kernel.\n");
entry(physImage, _kernel_size + BI_ALLOC_SIZE, start_mem); entry(physImage, kernel_size + BI_ALLOC_SIZE, start_mem);
return 0; return 0;