Use defs.mk defins in most MD code
Use defines from defs.mk in most MD code (the biggest exception is x86, which will be its own commit due to its size). Prefer including bsd.init.mk over the variations (../Makefile.inc and src.opts.mk being the two biggest ones). Sponsored by: Netflix
This commit is contained in:
Warner Losh
parent
fa68dcb104
commit
0b9bfebf8b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325114
@ -29,6 +29,8 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
INSTALLFLAGS= -b
|
||||
|
||||
LOADERS= flashboot jtagboot
|
||||
@ -47,8 +49,9 @@ AFLAGS= -G0
|
||||
|
||||
CFLAGS= -ffreestanding \
|
||||
-I${.CURDIR} \
|
||||
-I${.CURDIR}/../../../common \
|
||||
-I${.CURDIR}/../../../.. \
|
||||
-I${SASRC} \
|
||||
-I${LDRSRC} \
|
||||
-I${SYSDIR} \
|
||||
-D_KERNEL \
|
||||
-Wall \
|
||||
-G0 \
|
||||
@ -62,8 +65,8 @@ LDFLAGS= -nostdlib \
|
||||
-G0 \
|
||||
-L${.CURDIR}
|
||||
|
||||
.PATH: ${.CURDIR}/../common
|
||||
CFLAGS+= -I${.CURDIR}/../common
|
||||
.PATH: ${BOOTSRC}/mips/beri/common
|
||||
CFLAGS+= -I${BOOTSRC}/mips/beri/common
|
||||
|
||||
flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
|
||||
${CC} ${LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET} \
|
||||
|
||||
@ -29,7 +29,8 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
MK_SSP= no
|
||||
MAN=
|
||||
|
||||
@ -67,11 +68,11 @@ LOADER_GZIP_SUPPORT?= yes
|
||||
LOADER_BZIP2_SUPPORT?= yes
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../../loader.mk"
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
|
||||
# BERI files common to boot2 and loader
|
||||
.PATH: ${.CURDIR}/../common
|
||||
CFLAGS+= -I${.CURDIR}/../common
|
||||
.PATH: ${BOOTSRC}/mips/beri/common
|
||||
CFLAGS+= -I${BOOTSRC}/mips/beri/common
|
||||
|
||||
# Loader-specific MD headers
|
||||
CFLAGS+= -I${.CURDIR}
|
||||
@ -98,8 +99,8 @@ loader.help: help.common help.mips
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../../forth
|
||||
.include "${.CURDIR}/../../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
FILES+= loader.rc menu.rc
|
||||
|
||||
@ -108,8 +109,8 @@ FILES+= loader.rc menu.rc
|
||||
CFLAGS+= -ffunction-sections -fdata-sections
|
||||
CFLAGS+= -Wl,--gc-sections
|
||||
# Link USB BOOT library
|
||||
LDADD+= ${.OBJDIR}/../../../usb/libusbboot.a
|
||||
CFLAGS+= -I${.CURDIR}/../../../usb
|
||||
LDADD+= ${BOOTOBJ}/usb/libusbboot.a
|
||||
CFLAGS+= -I${BOOTSRC}/usb
|
||||
# Define USB SUPPORT
|
||||
CFLAGS+= -DLOADER_USB_SUPPORT
|
||||
.endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
FILES= ubldr
|
||||
|
||||
@ -26,7 +26,7 @@ LOADER_BZIP2_SUPPORT?= no
|
||||
LOADER_FDT_SUPPORT= ${MK_FDT}
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= loader.help
|
||||
@ -35,14 +35,14 @@ CFLAGS+= -ffreestanding -msoft-float -g
|
||||
|
||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.${MACHINE_CPUARCH}
|
||||
|
||||
.include "../../uboot.mk"
|
||||
.include "${BOOTSRC}/uboot.mk"
|
||||
|
||||
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
|
||||
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
|
||||
|
||||
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
|
||||
|
||||
loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt
|
||||
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
@ -60,8 +60,8 @@ ubldr: ${OBJS} ldscript.abs ${.CURDIR}/ldscript.${MACHINE_CPUARCH} ${DPADD}
|
||||
CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin
|
||||
|
||||
.if !defined(LOADER_ONLY)
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.include "${.CURDIR}/../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
# Install loader.rc.
|
||||
FILES+= loader.rc
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
LIB= ofw
|
||||
INTERNALLIB=
|
||||
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
SSP_CFLAGS=
|
||||
|
||||
PROG= boot1.elf
|
||||
@ -12,13 +14,11 @@ SRCS= boot1.c ashldi3.c syncicache.c
|
||||
MAN=
|
||||
|
||||
CFLAGS= -ffreestanding -msoft-float \
|
||||
-I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
|
||||
-I${LDRSRC} -I${SYSDIR} -I${SASRC} \
|
||||
-D_STANDALONE
|
||||
LDFLAGS=-nostdlib -static -Wl,-N
|
||||
|
||||
.include "../Makefile.inc"
|
||||
|
||||
.PATH: ${.CURDIR}/../../../libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR}
|
||||
.PATH: ${SYSDIR}/libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR}
|
||||
|
||||
# The following inserts out objects into a template HFS
|
||||
# created by generate-hfs.sh
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
MK_SSP= no
|
||||
MAN=
|
||||
|
||||
@ -25,19 +25,18 @@ LOADER_FDT_SUPPORT= yes
|
||||
LOADER_BZIP2_SUPPORT?= no
|
||||
|
||||
.if ${LOADER_FDT_SUPPORT} == "yes"
|
||||
CFLAGS+= -I${.CURDIR}/../../fdt
|
||||
CFLAGS+= -I${.OBJDIR}/../../fdt
|
||||
CFLAGS+= -I${.CURDIR}/../../../contrib/libfdt
|
||||
CFLAGS+= -I${FDTSRC}
|
||||
CFLAGS+= -I${SYSDIR}/contrib/libfdt
|
||||
CFLAGS+= -DLOADER_FDT_SUPPORT
|
||||
LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
|
||||
LIBFDT= ${BOOTOBJ}/fdt/libfdt.a
|
||||
.endif
|
||||
|
||||
CFLAGS+= -mcpu=powerpc64
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.PATH: ${.CURDIR}/../../../libkern
|
||||
CFLAGS+= -I${.CURDIR}/../../..
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
.PATH: ${SYSDIR}/libkern
|
||||
CFLAGS+= -I${SYSDIR}
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= loader.help
|
||||
@ -52,19 +51,15 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||
# 64-bit bridge extensions
|
||||
CFLAGS+= -Wa,-mppc64bridge
|
||||
|
||||
# Pull in common loader code
|
||||
#.PATH: ${.CURDIR}/../../ofw/common
|
||||
#.include "${.CURDIR}/../../ofw/common/Makefile.inc"
|
||||
|
||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
||||
|
||||
loader.help: help.common help.kboot ${.CURDIR}/../../fdt/help.fdt
|
||||
loader.help: help.common help.kboot ${FDTSRC}/help.fdt
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.include "${.CURDIR}/../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
FILES+= loader.rc menu.rc
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
MK_SSP= no
|
||||
MAN=
|
||||
|
||||
@ -25,18 +25,17 @@ LOADER_FDT_SUPPORT?= yes
|
||||
|
||||
.if ${LOADER_FDT_SUPPORT} == "yes"
|
||||
SRCS+= ofwfdt.c
|
||||
CFLAGS+= -I${.CURDIR}/../../fdt
|
||||
CFLAGS+= -I${.OBJDIR}/../../fdt
|
||||
CFLAGS+= -I${.CURDIR}/../../../contrib/libfdt
|
||||
CFLAGS+= -I${FDTSRC}
|
||||
CFLAGS+= -I${SYSDIR}/contrib/libfdt
|
||||
CFLAGS+= -DLOADER_FDT_SUPPORT
|
||||
LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
|
||||
LIBFDT= ${BOOTOBJ}/fdt/libfdt.a
|
||||
.endif
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
|
||||
.PATH: ${.CURDIR}/../../../libkern
|
||||
CFLAGS+= -I${.CURDIR}/../../..
|
||||
.PATH: ${SYSDIR}/libkern
|
||||
CFLAGS+= -I${SYSDIR}
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= loader.help
|
||||
@ -49,22 +48,22 @@ CFLAGS+= -DRELOC=${RELOC}
|
||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||
|
||||
# Pull in common loader code
|
||||
.PATH: ${.CURDIR}/../../ofw/common
|
||||
.include "${.CURDIR}/../../ofw/common/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/ofw/common
|
||||
.include "${BOOTSRC}/ofw/common/Makefile.inc"
|
||||
|
||||
# Open Firmware standalone support library
|
||||
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${.CURDIR}/../../ofw/libofw
|
||||
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/ofw/libofw
|
||||
|
||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
||||
|
||||
loader.help: help.common help.ofw ${.CURDIR}/../../fdt/help.fdt
|
||||
loader.help: help.common help.ofw ${FDTSRC}/help.fdt
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.include "${.CURDIR}/../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
FILES+= loader.rc menu.rc
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
MK_SSP= no
|
||||
MAN=
|
||||
|
||||
@ -25,18 +25,17 @@ LOADER_FDT_SUPPORT?= no
|
||||
LOADER_BZIP2_SUPPORT?= no
|
||||
|
||||
.if ${LOADER_FDT_SUPPORT} == "yes"
|
||||
CFLAGS+= -I${.CURDIR}/../../fdt
|
||||
CFLAGS+= -I${.OBJDIR}/../../fdt
|
||||
CFLAGS+= -I${FDTSRC}
|
||||
CFLAGS+= -DLOADER_FDT_SUPPORT
|
||||
LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
|
||||
LIBFDT= ${BOOTOBJ}/fdt/libfdt.a
|
||||
.endif
|
||||
|
||||
CFLAGS+= -mcpu=powerpc64
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.PATH: ${.CURDIR}/../../../libkern
|
||||
CFLAGS+= -I${.CURDIR}/../../..
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
.PATH: ${SYSDIR}/libkern
|
||||
CFLAGS+= -I${SYSDIR}
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= loader.help
|
||||
@ -48,10 +47,6 @@ CFLAGS+= -DRELOC=${RELOC}
|
||||
|
||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||
|
||||
# Pull in common loader code
|
||||
#.PATH: ${.CURDIR}/../../ofw/common
|
||||
#.include "${.CURDIR}/../../ofw/common/Makefile.inc"
|
||||
|
||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
|
||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
|
||||
|
||||
@ -60,12 +55,12 @@ SC_DFLT_FONT=cp437
|
||||
font.h:
|
||||
uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h
|
||||
|
||||
loader.help: help.common help.ps3 ${.CURDIR}/../../fdt/help.fdt
|
||||
loader.help: help.common help.ps3 ${FDTSRC}/help.fdt
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.include "${.CURDIR}/../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
FILES+= loader.rc menu.rc
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
PROG= ubldr
|
||||
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
|
||||
@ -22,9 +22,9 @@ LOADER_BZIP2_SUPPORT?= no
|
||||
LOADER_FDT_SUPPORT= ${MK_FDT}
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.PATH: ${.CURDIR}/../../../libkern
|
||||
CFLAGS+= -I${.CURDIR}/../../..
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
.PATH: ${SYSDIR}/libkern
|
||||
CFLAGS+= -I${SYSDIR}
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= ${PROG}.help
|
||||
@ -33,16 +33,16 @@ CFLAGS+= -ffreestanding
|
||||
|
||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||
|
||||
.include "../../uboot.mk"
|
||||
.include "${BOOTSRC}/uboot.mk"
|
||||
|
||||
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
|
||||
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
|
||||
|
||||
loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt
|
||||
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
FILES= loader.help
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include "../Makefile.inc"
|
||||
.include <bsd.init.mk>
|
||||
|
||||
PROG= boot1.elf
|
||||
INTERNALPROG=
|
||||
@ -13,7 +13,7 @@ BOOTBLOCKBASE= 0x4000
|
||||
|
||||
CFLAGS.clang+=-mcmodel=small
|
||||
CFLAGS.gcc+=-mcmodel=medlow
|
||||
CFLAGS+=-Os -I${.CURDIR}/../../common
|
||||
CFLAGS+=-Os -I${LDRSRC} -nostdlib
|
||||
LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
|
||||
|
||||
# Construct boot1. sunlabel expects it to contain zeroed-out space for the
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
MK_SSP= no
|
||||
MAN=
|
||||
|
||||
@ -25,18 +25,20 @@ LOADER_GZIP_SUPPORT?= yes
|
||||
LOADER_BZIP2_SUPPORT?= no
|
||||
LOADER_DEBUG?= no
|
||||
|
||||
CFLAGS+=-nostdlib
|
||||
|
||||
.if ${LOADER_DEBUG} == "yes"
|
||||
CFLAGS+= -DLOADER_DEBUG
|
||||
.endif
|
||||
.if ${LOADER_ZFS_SUPPORT} == "yes"
|
||||
CFLAGS+= -DLOADER_ZFS_SUPPORT
|
||||
CFLAGS+= -I${.CURDIR}/../../zfs
|
||||
CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs
|
||||
LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a
|
||||
CFLAGS+= -I${BOOTSRC}/zfs
|
||||
CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
|
||||
LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a
|
||||
.endif
|
||||
|
||||
# Always add MI sources
|
||||
.include "../../loader.mk"
|
||||
.include "${BOOTSRC}/loader.mk"
|
||||
CFLAGS+= -I.
|
||||
|
||||
CLEANFILES+= loader.help
|
||||
@ -44,8 +46,8 @@ CLEANFILES+= loader.help
|
||||
LDFLAGS= -static
|
||||
|
||||
# Open Firmware standalone support library
|
||||
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
|
||||
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/ofw/libofw/
|
||||
|
||||
# Need sys/ for crypto/intake.h
|
||||
CFLAGS+= -I${SRCTOP}/sys
|
||||
@ -57,8 +59,8 @@ loader.help: help.common help.sparc64
|
||||
cat ${.ALLSRC} | \
|
||||
awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
|
||||
|
||||
.PATH: ${.CURDIR}/../../forth
|
||||
.include "${.CURDIR}/../../forth/Makefile.inc"
|
||||
.PATH: ${BOOTSRC}/forth
|
||||
.include "${BOOTSRC}/forth/Makefile.inc"
|
||||
|
||||
FILES+= loader.rc menu.rc
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user