Skip to content

Commit

Permalink
stand: Rename LIBFDT to LIBSAFDT
Browse files Browse the repository at this point in the history
Preemptively address a collision with LIBFDT (to be added in the future)
from src.libnames.mk, which gets included via bsd.progs.mk.  No
functional change intended.

Reviewed by:	imp
MFC after:	1 week
Sponsored by:	Innovate UK
Differential Revision:	https://reviews.freebsd.org/D42486
  • Loading branch information
markjdb committed Nov 7, 2023
1 parent b8dbfb0 commit b247ff7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions stand/efi/loader/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ ${LOADER}.efi: ${PROG}

LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a

DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}
DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA}

.include <bsd.prog.mk>
2 changes: 1 addition & 1 deletion stand/fdt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ CFLAGS+= -I${FDTSRC}
CFLAGS+= -I${BOOTOBJ}/fdt
CFLAGS+= -I${SYSDIR}/contrib/libfdt
CFLAGS+= -DLOADER_FDT_SUPPORT
LIBFDT= ${BOOTOBJ}/fdt/libfdt.a
LIBSAFDT= ${BOOTOBJ}/fdt/libfdt.a
.endif
4 changes: 2 additions & 2 deletions stand/kboot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}

CFLAGS+= -Wall

DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}

.include <bsd.prog.mk>
4 changes: 2 additions & 2 deletions stand/powerpc/ofw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ LDFLAGS+= -T ${.CURDIR}/ldscript.powerpc
LIBOFW= ${BOOTOBJ}/libofw/libofw.a
CFLAGS+= -I${BOOTSRC}/libofw

DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}

MK_PIE= no

Expand Down
4 changes: 2 additions & 2 deletions stand/uboot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
ubldr ubldr.bin ubldr.pie: ${OBJS}
.endif

DPADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA}
DPADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA}

.include <bsd.prog.mk>

0 comments on commit b247ff7

Please sign in to comment.