diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:57:05 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:57:05 +0000 |
| commit | 9576e1ee54c081885977d53ef7b96674323dc8ff (patch) | |
| tree | bf27ef3c8965782a2af62a43c931f4a382a26bb0 /sys/boot | |
| parent | cd955ec800c72245c48af837ac507e8137b3c9fe (diff) | |
| download | src-test2-9576e1ee54c081885977d53ef7b96674323dc8ff.tar.gz src-test2-9576e1ee54c081885977d53ef7b96674323dc8ff.zip | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/boot1/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/libsa/ufsread.c (renamed from sys/boot/common/ufsread.c) | 0 | ||||
| -rw-r--r-- | sys/boot/powerpc/boot1.chrp/Makefile | 5 | ||||
| -rw-r--r-- | sys/boot/sparc64/boot1/Makefile | 4 |
5 files changed, 9 insertions, 6 deletions
diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile index 883d6d39d1d8..1907dc222d18 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -2,7 +2,7 @@ MAN= -.include <src.opts.mk> +.include "../Makefile.inc" MK_SSP= no @@ -120,7 +120,7 @@ boot1.efi: ${PROG} -j .rela.dyn -j .reloc -j .eh_frame \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} -boot1.o: ${.CURDIR}/../../common/ufsread.c +boot1.o: ${SASRC}/ufsread.c # The following inserts our objects into a template FAT file system # created by generate-fat.sh diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index e7f2c8391cda..e85c54654eca 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -78,7 +78,7 @@ gptboot.bin: gptboot.out gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o cons.o util.o ${OPENCRYPTO_XTS} ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSA32} -gptboot.o: ${.CURDIR}/../../common/ufsread.c +gptboot.o: ${SASRC}/ufsread.c .if ${MACHINE_CPUARCH} == "amd64" beforedepend gptboot.o: machine diff --git a/sys/boot/common/ufsread.c b/sys/boot/libsa/ufsread.c index bd9ad2c57103..bd9ad2c57103 100644 --- a/sys/boot/common/ufsread.c +++ b/sys/boot/libsa/ufsread.c diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/sys/boot/powerpc/boot1.chrp/Makefile index a642f6c4b958..1caacd8b5840 100644 --- a/sys/boot/powerpc/boot1.chrp/Makefile +++ b/sys/boot/powerpc/boot1.chrp/Makefile @@ -17,7 +17,8 @@ CFLAGS= -ffreestanding -msoft-float \ -D_STANDALONE LDFLAGS=-nostdlib -static -Wl,-N -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" + .PATH: ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR} # The following inserts out objects into a template HFS @@ -36,7 +37,7 @@ boot1.hfs: boot1.elf bootinfo.txt CLEANFILES= boot1.hfs -boot1.o: ${.CURDIR}/../../common/ufsread.c +boot1.o: ${SASRC}/ufsread.c .include <bsd.prog.mk> diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile index 3453b286308e..8804ed6dd63b 100644 --- a/sys/boot/sparc64/boot1/Makefile +++ b/sys/boot/sparc64/boot1/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include "../Makefile.inc" + PROG= boot1.elf INTERNALPROG= MAN= @@ -25,6 +27,6 @@ ${FILES}: boot1.aout boot1.aout: boot1.elf elf2aout -o ${.TARGET} ${.ALLSRC} -boot1.o: ${.CURDIR}/../../common/ufsread.c +boot1.o: ${SASRC}/ufsread.c .include <bsd.prog.mk> |