From: rahnds <rahnds@openbsd.org>
Date: Thu, 27 Apr 2000 12:36:29 +0000 (+0000)
Subject: Fixes to xcoff bootloader to allow it to execute and load kernels for OpenBSD.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=08e027d6bb9ca863bfc44a1aa6957ff3a242e2f4;p=openbsd

Fixes to xcoff bootloader to allow it to execute and load kernels for OpenBSD.
---

diff --git a/sys/arch/powerpc/stand/boot.mac/Makefile b/sys/arch/powerpc/stand/boot.mac/Makefile
index 07b7f041de6..59533e28a9b 100644
--- a/sys/arch/powerpc/stand/boot.mac/Makefile
+++ b/sys/arch/powerpc/stand/boot.mac/Makefile
@@ -1,22 +1,22 @@
-#	$OpenBSD: Makefile,v 1.5 1999/11/09 06:30:15 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/04/27 12:36:29 rahnds Exp $
 #       $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
 
 R=              ..
 .PATH:          $(.CURDIR)/$(R)
-RELOC=		20000
+RELOC=		6c0000
 ENTRY=		_entry
-LOADADDR=	20000
 PROG=           boot.mac
 SRCS=           Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
-CFLAGS+=       -DDEBUG -DNETIF_DEBUG
-CFLAGS+=	-DEXEC_ELF -DXCOFF_GLUE -DMAC
+CFLAGS+=        -DDEBUG -DNETIF_DEBUG
+CFLAGS+=	-DXCOFF_GLUE
 NOMAN=
 INSTALL_STRIP=
-MAKEELF=        makeelf
 BINDIR=         /usr/mdec
 OBJCOPY?=	objcopy
 OBJCOPY_ARGS=	-O aixcoff-rs6000 -R .stab -R .stabstr -R .comment
-LDFLAGS=	-X -Ttext $(RELOC) -e $(ENTRY) -T ${.CURDIR}/ld.script
+LDFLAGS=	-X -Ttext ${RELOC} -e $(ENTRY) -T ${.CURDIR}/ld.script
+CPPFLAGS+=	-DPOWERPC_BOOT_ELF
+
 
 LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep
 CLEANFILES=	hack-coff
@@ -25,7 +25,6 @@ $(PROG):        $(OBJS) $(LIBS) hack-coff
 	$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o ${.TARGET}
 	${OBJCOPY} ${OBJCOPY_ARGS} ${.TARGET}
 	${.OBJDIR}/hack-coff ${.TARGET}
-#	${MAKEELF} $(REAL_VIRT) a.out $(.TARGET)
 
 hack-coff:	hack-coff.c
 	${HOSTCC} -I${.CURDIR} -o hack-coff ${.CURDIR}/hack-coff.c