aboutsummaryrefslogtreecommitdiff
path: root/tip22
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-11-25 17:04:13 +0100
committerGuido Guenther <agx@sigxcpu.org>2007-11-25 17:04:13 +0100
commit7030dd82704ba0bc1c06405ea0b120b50ae820c6 (patch)
tree0d98c05956b6b92af3ddc7b559b3cd7d4c10e598 /tip22
parent718deff70d9dc79b2712a2763543d561a43e1adc (diff)
tftpload.c: fix misleading printouts
Diffstat (limited to 'tip22')
-rw-r--r--tip22/tftpload.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/tip22/tftpload.c b/tip22/tftpload.c
index b9dff19..86bf111 100644
--- a/tip22/tftpload.c
+++ b/tip22/tftpload.c
@@ -257,7 +257,7 @@ static ULONG CopyKernel(ULONG* kernel_end)
(*kernel_end) = CopyProgramSegments32(header);
- printf("Starting kernel; entry point = 0x%lx\n\r",
+ printf("Kernel entry point is 0x%lx\n\r",
((ULONG) KSEG0ADDR(header->e_entry)));
return KSEG0ADDR(header->e_entry);
} else if (header->e_ident[EI_CLASS] == ELFCLASS64) {
@@ -274,8 +274,8 @@ static ULONG CopyKernel(ULONG* kernel_end)
(*kernel_end) = CopyProgramSegments64(header64);
- printf("Starting kernel; entry point = 0x%lx\n\r",
- ((ULONG) KSEG0ADDR(header64->e_entry)));
+ printf("Kernel entry point is 0x%lx\n\r",
+ ((ULONG)KSEG0ADDR(header64->e_entry)));
return KSEG0ADDR(header64->e_entry);
} else
Fatal("Neither an ELF32 nor an ELF64 kernel\n\r");
@@ -285,9 +285,10 @@ static ULONG CopyKernel(ULONG* kernel_end)
static void copyRamdisk(void* rd_vaddr, void* rd_start, ULONG rd_size)
{
- memcpy(rd_vaddr, rd_start, rd_size);
- printf("Copied initrd from 0x%p to 0x%p (0x%lx bytes)\n\r",
+ printf("Copying initrd from 0x%p to 0x%p (0x%lx bytes)...\n\r",
rd_start, rd_vaddr, rd_size);
+ memcpy(rd_vaddr, rd_start, rd_size);
+ printf("Initrd copied.\n\r");
}
void _start(LONG argc, CHAR * argv[], CHAR * envp[])
@@ -309,7 +310,7 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[])
InitMalloc();
- /* copy the kernel to its load address */
+ /* copy kernel and ramdisk to its load addresses */
#ifdef DEBUG
printf("Embedded kernel image starts 0x%p, ends 0x%p\n\r",
&__kernel_start, &__kernel_end);
@@ -344,6 +345,7 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[])
Wait("\n\r--- Debug: press <spacebar> to boot kernel ---");
#endif
/* Finally jump into the kernel */
+ printf("Starting kernel...\n\r");
ArcFlushAllCaches();
if( kernel_entry )
(*kernel_entry)(nargc ,nargv, envp);