Changeset 1bedc54 in mainline

Timestamp:

2006-02-26T13:17:48Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1b08233

Parents:

d81e6bdf

Message:

kernel size fix

Location:

arch/ppc32/loader

Files:

• main.c (modified) (2 diffs)
• main.h (modified) (1 diff)

arch/ppc32/loader/main.c

@@ -32 +32 @@
 
 #define KERNEL_LOAD_ADDRESS 0x800000
-#define KERNEL_SIZE _binary_____________kernel_kernel_bin_size
+#define KERNEL_SIZE ((unsigned int) &_binary_____________kernel_kernel_bin_end - (unsigned int) &_binary_____________kernel_kernel_bin_start)
 
 static void halt(void)
@@ -41 +41 @@
 void bootstrap(void)
 {
-        printf("\nHelenOS PPC Bootloader\nKernel size %d, load address %L\n", KERNEL_SIZE, KERNEL_LOAD_ADDRESS);
+        printf("\nHelenOS PPC Bootloader\nKernel size %d bytes, load address %L\n", KERNEL_SIZE, KERNEL_LOAD_ADDRESS);
         
         void *addr = ofw_claim((void *) KERNEL_LOAD_ADDRESS, KERNEL_SIZE, 1);

arch/ppc32/loader/main.h

@@ -30 +30 @@
 #define __MAIN_H__
 
-extern unsigned int _binary_____________kernel_kernel_bin_size;
-extern void *_binary_____________kernel_kernel_bin_start;
+extern int _binary_____________kernel_kernel_bin_start;
+extern int _binary_____________kernel_kernel_bin_end;
 extern void bootstrap(void);