diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-10-29 05:27:22 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-10-29 05:27:22 +0000 |
| commit | 05c2ec42c6ef27a9a0ecc3911072ea920681d809 (patch) | |
| tree | e30b4445e59e541e903d10edf8f44a2553d3be15 /sys/boot/uboot | |
| parent | f08693930beffcc915717f72f8b4bce5210502df (diff) | |
| download | src-05c2ec42c6ef27a9a0ecc3911072ea920681d809.tar.gz src-05c2ec42c6ef27a9a0ecc3911072ea920681d809.zip | |
Cleanup non-arch Makefiles
Use SYSDIR, BOOTSRC, LDRSRC and FDTSRC in preference to relative
paths. Also, use bsd.init.mk where needed.
Sponsored by: Netflix
Notes
Notes:
svn path=/head/; revision=325094
Diffstat (limited to 'sys/boot/uboot')
| -rw-r--r-- | sys/boot/uboot/fdt/Makefile | 12 | ||||
| -rw-r--r-- | sys/boot/uboot/lib/Makefile | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/boot/uboot/fdt/Makefile b/sys/boot/uboot/fdt/Makefile index 0df20265a71a..1409e3e4696e 100644 --- a/sys/boot/uboot/fdt/Makefile +++ b/sys/boot/uboot/fdt/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.include <src.opts.mk> +.include <bsd.init.mk> -.PATH: ${.CURDIR}/../../common +.PATH: ${LDRSRC} LIB= uboot_fdt INTERNALLIB= @@ -13,16 +13,16 @@ SRCS= uboot_fdt.c CFLAGS+= -ffreestanding -msoft-float # U-Boot library headers -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${UBOOTSRC}/lib # libfdt headers -CFLAGS+= -I${.CURDIR}/../../fdt +CFLAGS+= -I${FDTSRC} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine + ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine CLEANFILES+= machine diff --git a/sys/boot/uboot/lib/Makefile b/sys/boot/uboot/lib/Makefile index f88d0b3aaf15..8fce769c77c8 100644 --- a/sys/boot/uboot/lib/Makefile +++ b/sys/boot/uboot/lib/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.include <src.opts.mk> +.include <bsd.init.mk> -.PATH: ${.CURDIR}/../../common +.PATH: ${LDRSRC} LIB= uboot INTERNALLIB= @@ -24,14 +24,14 @@ LOADER_FDT_SUPPORT= no .endif .if ${LOADER_FDT_SUPPORT} == "yes" -CFLAGS+= -DLOADER_FDT_SUPPORT -I${.CURDIR}/../../fdt +CFLAGS+= -DLOADER_FDT_SUPPORT -I${FDTSRC} .endif # Pick up FDT includes CFLAGS+= -I${SYSDIR}/contrib/libfdt/ # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. .ifdef(BOOT_DISK_DEBUG) # Make the disk code more talkative @@ -39,7 +39,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine + ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine CLEANFILES+= machine |