Update the bootloader to work with the ofwoea_initppc code used by macppc

This commit is contained in:
garbled 2007-10-18 19:58:54 +00:00
parent 016efc036d
commit 9898e70302

View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.15 2005/12/11 12:18:30 christos Exp $ */ /* $NetBSD: boot.c,v 1.16 2007/10/18 19:58:54 garbled Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -165,16 +165,15 @@ chain(boot_entry_t entry, char *args, void *ssym, void *esym)
* strings. * strings.
*/ */
l = strlen(args) + 1; l = strlen(args) + 1;
l = (l + 3) & ~3; /* align */
DPRINTF("magic @ %p\n", args + l);
memcpy(args + l, &magic, sizeof(magic));
l += sizeof(magic);
DPRINTF("ssym @ %p\n", args + l); DPRINTF("ssym @ %p\n", args + l);
memcpy(args + l, &ssym, sizeof(ssym)); memcpy(args + l, &ssym, sizeof(ssym));
l += sizeof(ssym); l += sizeof(ssym);
DPRINTF("esym @ %p\n", args + l); DPRINTF("esym @ %p\n", args + l);
memcpy(args + l, &esym, sizeof(esym)); memcpy(args + l, &esym, sizeof(esym));
l += sizeof(esym); l += sizeof(esym);
DPRINTF("magic @ %p\n", args + l);
memcpy(args + l, &magic, sizeof(magic));
l += sizeof(magic);
DPRINTF("args + l -> %p\n", args + l); DPRINTF("args + l -> %p\n", args + l);
OF_chain((void *) RELOC, end - (char *)RELOC, entry, args, l); OF_chain((void *) RELOC, end - (char *)RELOC, entry, args, l);