[PATCH] remove duplicate printf in arch/ppc64/boot/main.c
initrd size is printed as hex, add a missing 0x remove a duplicate printf when initrd is used. remove use of kernel type to access the first bytes of the initrd memarea. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
e6019db5a7
commit
b1bdfbd0a2
|
@ -146,10 +146,10 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
|
||||||
}
|
}
|
||||||
a1 = initrd.addr;
|
a1 = initrd.addr;
|
||||||
a2 = initrd.size;
|
a2 = initrd.size;
|
||||||
printf("initial ramdisk moving 0x%lx <- 0x%lx (%lx bytes)\n\r",
|
printf("initial ramdisk moving 0x%lx <- 0x%lx (0x%lx bytes)\n\r",
|
||||||
initrd.addr, (unsigned long)_initrd_start, initrd.size);
|
initrd.addr, (unsigned long)_initrd_start, initrd.size);
|
||||||
memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size);
|
memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size);
|
||||||
printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));
|
printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd.addr));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Eventually gunzip the kernel */
|
/* Eventually gunzip the kernel */
|
||||||
|
@ -200,9 +200,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
|
||||||
|
|
||||||
flush_cache((void *)vmlinux.addr, vmlinux.size);
|
flush_cache((void *)vmlinux.addr, vmlinux.size);
|
||||||
|
|
||||||
if (a1)
|
|
||||||
printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));
|
|
||||||
|
|
||||||
kernel_entry = (kernel_entry_t)vmlinux.addr;
|
kernel_entry = (kernel_entry_t)vmlinux.addr;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printf( "kernel:\n\r"
|
printf( "kernel:\n\r"
|
||||||
|
|
Loading…
Reference in New Issue