summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/boot/powerpc/loader/Makefile65
-rw-r--r--sys/boot/powerpc/ofw/Makefile65
2 files changed, 38 insertions, 92 deletions
diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile
index 0560dd5..83fa1e0 100644
--- a/sys/boot/powerpc/loader/Makefile
+++ b/sys/boot/powerpc/loader/Makefile
@@ -1,14 +1,12 @@
# $FreeBSD$
-BASE= loader
-PROG= ${BASE}
+PROG= loader
NOMAN=
-STRIP=
NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC
BINDIR?= /boot
INSTALLFLAGS= -b
-# architecture-specific loader code
+# Architecture-specific loader code
SRCS= conf.c metadata.c vers.c start.c
LOADER_DISK_SUPPORT?= yes
@@ -21,7 +19,7 @@ LOADER_TFTP_SUPPORT?= yes
LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= no
-.if defined(LOADER_DISK_SUPPORT)
+.if ${LOADER_DISK_SUPPORT} == "yes"
CFLAGS+= -DLOADER_DISK_SUPPORT
.endif
.if ${LOADER_UFS_SUPPORT} == "yes"
@@ -33,7 +31,13 @@ CFLAGS+= -DLOADER_CD9660_SUPPORT
.if ${LOADER_EXT2FS_SUPPORT} == "yes"
CFLAGS+= -DLOADER_EXT2FS_SUPPORT
.endif
-.if defined(LOADER_NET_SUPPORT)
+.if ${LOADER_GZIP_SUPPORT} == "yes"
+CFLAGS+= -DLOADER_GZIP_SUPPORT
+.endif
+.if ${LOADER_BZIP2_SUPPORT} == "yes"
+CFLAGS+= -DLOADER_BZIP2_SUPPORT
+.endif
+.if ${LOADER_NET_SUPPORT} == "yes"
CFLAGS+= -DLOADER_NET_SUPPORT
.endif
.if ${LOADER_NFS_SUPPORT} == "yes"
@@ -42,31 +46,21 @@ CFLAGS+= -DLOADER_NFS_SUPPORT
.if ${LOADER_TFTP_SUPPORT} == "yes"
CFLAGS+= -DLOADER_TFTP_SUPPORT
.endif
-.if ${LOADER_GZIP_SUPPORT} == "yes"
-CFLAGS+= -DLOADER_GZIP_SUPPORT
-.endif
-.if ${LOADER_BZIP2_SUPPORT} == "yes"
-CFLAGS+= -DLOADER_BZIP2_SUPPORT
-.endif
.if !defined(NOFORTH)
# Enable BootForth
BOOT_FORTH= yes
CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
-.if exists(${.OBJDIR}/../../ficl/libficl.a)
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
-.else
-LIBFICL= ${.CURDIR}/../../ficl/libficl.a
-.endif
.endif
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
-.include <${.CURDIR}/../../common/Makefile.inc>
+.include "${.CURDIR}/../../common/Makefile.inc"
CFLAGS+= -I${.CURDIR}/../../common
-CFLAGS+= -I${.CURDIR}/../../.. -I.
+CFLAGS+= -I.
-CLEANFILES+= vers.c ${BASE}.help
+CLEANFILES+= vers.c loader.help
CFLAGS+= -ffreestanding
# load address
@@ -76,52 +70,31 @@ LDFLAGS= -nostdlib -static -Ttext ${RELOC}
# Pull in common loader code
.PATH: ${.CURDIR}/../../ofw/common
-.include <${.CURDIR}/../../ofw/common/Makefile.inc>
+.include "${.CURDIR}/../../ofw/common/Makefile.inc"
# OpenFirmware standalone support library
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
CFLAGS+= -I${.CURDIR}/../../ofw/libofw
# where to get libstand from
-#XXX need a better way to do this
-LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND= -lstand
-.endif
-.endif
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-
-# Debug me!
-CFLAGS+= -g
-LDFLAGS+= -g
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBOFW} -lstand
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-${BASE}.help: help.common help.ofw
+loader.help: help.common help.ofw
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
.PATH: ${.CURDIR}/../../forth
-FILES= ${BASE}.help loader.4th support.4th loader.conf
+FILES= loader.help loader.4th support.4th loader.conf
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
.endif
-# Cannot use ${OBJS} above this line
.include <bsd.prog.mk>
-
-.if exists(${.CURDIR}/../../../powerpc/include)
-beforedepend ${OBJS}: machine
-
-machine:
- ln -sf ${.CURDIR}/../../../powerpc/include machine
-.endif
-
-CLEANFILES+= machine
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index 0560dd5..83fa1e0 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -1,14 +1,12 @@
# $FreeBSD$
-BASE= loader
-PROG= ${BASE}
+PROG= loader
NOMAN=
-STRIP=
NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC
BINDIR?= /boot
INSTALLFLAGS= -b
-# architecture-specific loader code
+# Architecture-specific loader code
SRCS= conf.c metadata.c vers.c start.c
LOADER_DISK_SUPPORT?= yes
@@ -21,7 +19,7 @@ LOADER_TFTP_SUPPORT?= yes
LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= no
-.if defined(LOADER_DISK_SUPPORT)
+.if ${LOADER_DISK_SUPPORT} == "yes"
CFLAGS+= -DLOADER_DISK_SUPPORT
.endif
.if ${LOADER_UFS_SUPPORT} == "yes"
@@ -33,7 +31,13 @@ CFLAGS+= -DLOADER_CD9660_SUPPORT
.if ${LOADER_EXT2FS_SUPPORT} == "yes"
CFLAGS+= -DLOADER_EXT2FS_SUPPORT
.endif
-.if defined(LOADER_NET_SUPPORT)
+.if ${LOADER_GZIP_SUPPORT} == "yes"
+CFLAGS+= -DLOADER_GZIP_SUPPORT
+.endif
+.if ${LOADER_BZIP2_SUPPORT} == "yes"
+CFLAGS+= -DLOADER_BZIP2_SUPPORT
+.endif
+.if ${LOADER_NET_SUPPORT} == "yes"
CFLAGS+= -DLOADER_NET_SUPPORT
.endif
.if ${LOADER_NFS_SUPPORT} == "yes"
@@ -42,31 +46,21 @@ CFLAGS+= -DLOADER_NFS_SUPPORT
.if ${LOADER_TFTP_SUPPORT} == "yes"
CFLAGS+= -DLOADER_TFTP_SUPPORT
.endif
-.if ${LOADER_GZIP_SUPPORT} == "yes"
-CFLAGS+= -DLOADER_GZIP_SUPPORT
-.endif
-.if ${LOADER_BZIP2_SUPPORT} == "yes"
-CFLAGS+= -DLOADER_BZIP2_SUPPORT
-.endif
.if !defined(NOFORTH)
# Enable BootForth
BOOT_FORTH= yes
CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
-.if exists(${.OBJDIR}/../../ficl/libficl.a)
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
-.else
-LIBFICL= ${.CURDIR}/../../ficl/libficl.a
-.endif
.endif
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
-.include <${.CURDIR}/../../common/Makefile.inc>
+.include "${.CURDIR}/../../common/Makefile.inc"
CFLAGS+= -I${.CURDIR}/../../common
-CFLAGS+= -I${.CURDIR}/../../.. -I.
+CFLAGS+= -I.
-CLEANFILES+= vers.c ${BASE}.help
+CLEANFILES+= vers.c loader.help
CFLAGS+= -ffreestanding
# load address
@@ -76,52 +70,31 @@ LDFLAGS= -nostdlib -static -Ttext ${RELOC}
# Pull in common loader code
.PATH: ${.CURDIR}/../../ofw/common
-.include <${.CURDIR}/../../ofw/common/Makefile.inc>
+.include "${.CURDIR}/../../ofw/common/Makefile.inc"
# OpenFirmware standalone support library
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
CFLAGS+= -I${.CURDIR}/../../ofw/libofw
# where to get libstand from
-#XXX need a better way to do this
-LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND= -lstand
-.endif
-.endif
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-
-# Debug me!
-CFLAGS+= -g
-LDFLAGS+= -g
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBOFW} -lstand
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-${BASE}.help: help.common help.ofw
+loader.help: help.common help.ofw
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
.PATH: ${.CURDIR}/../../forth
-FILES= ${BASE}.help loader.4th support.4th loader.conf
+FILES= loader.help loader.4th support.4th loader.conf
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
.endif
-# Cannot use ${OBJS} above this line
.include <bsd.prog.mk>
-
-.if exists(${.CURDIR}/../../../powerpc/include)
-beforedepend ${OBJS}: machine
-
-machine:
- ln -sf ${.CURDIR}/../../../powerpc/include machine
-.endif
-
-CLEANFILES+= machine
OpenPOWER on IntegriCloud