Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4015
b: refs/heads/master
c: b1bdfbd
h: refs/heads/master
i:
  4013: 6fa329a
  4011: 8d1233f
  4007: 4214b7e
  3999: 48ef3ad
v: v3
  • Loading branch information
Olaf Hering authored and Paul Mackerras committed Jun 28, 2005
1 parent 76c8aaa commit d1628a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e6019db5a7f110839c62cefc073b6dc1143d6403
refs/heads/master: b1bdfbd0a29d6da4dbe42736faac02c43a9afe76
7 changes: 2 additions & 5 deletions trunk/arch/ppc64/boot/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
}
a1 = initrd.addr;
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);
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 */
Expand Down Expand Up @@ -200,9 +200,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr)

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;
#ifdef DEBUG
printf( "kernel:\n\r"
Expand Down

0 comments on commit d1628a2

Please sign in to comment.