d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move stand/ofw/libofw to stand/libofw.

Browse Source 
Since rS330365, there has been no particular reason for libofw to be in a
subdirectory of ofw. Move libofw up a level to make it fit in better with
the other top level libraries.

Also add a LIBOFWSRC to stand/defs.mk to match what all the other
libraries are doing.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D23000
This commit is contained in:
Brandon Bergren 2020-01-02 04:34:22 +00:00
parent bad7e1e85c
commit 475008d6ca
19 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/Makefile
View File

@ -16,7 +16,7 @@ S.${MK_FORTH}+= forth
S.${MK_LOADER_LUA}+= liblua S.${MK_LOADER_LUA}+= liblua
S.${MK_LOADER_LUA}+= lua S.${MK_LOADER_LUA}+= lua
S.${MK_FDT}+= fdt S.${MK_FDT}+= fdt
S.${MK_LOADER_OFW}+= ofw S.${MK_LOADER_OFW}+= libofw
S.yes+= defaults S.yes+= defaults
S.yes+= man S.yes+= man

1
stand/defs.mk
View File

@ -28,6 +28,7 @@ FDTSRC= ${BOOTSRC}/fdt
FICLSRC= ${BOOTSRC}/ficl FICLSRC= ${BOOTSRC}/ficl
LDRSRC= ${BOOTSRC}/common LDRSRC= ${BOOTSRC}/common
LIBLUASRC= ${BOOTSRC}/liblua LIBLUASRC= ${BOOTSRC}/liblua
LIBOFWSRC= ${BOOTSRC}/libofw
LUASRC= ${SRCTOP}/contrib/lua/src LUASRC= ${SRCTOP}/contrib/lua/src
SASRC= ${BOOTSRC}/libsa SASRC= ${BOOTSRC}/libsa
SYSDIR= ${SRCTOP}/sys SYSDIR= ${SRCTOP}/sys

0
stand/ofw/libofw/Makefile → stand/libofw/Makefile
View File

0
stand/ofw/libofw/devicename.c → stand/libofw/devicename.c
View File

0
stand/ofw/libofw/libofw.h → stand/libofw/libofw.h
View File

0
stand/ofw/libofw/ofw_console.c → stand/libofw/ofw_console.c
View File

0
stand/ofw/libofw/ofw_copy.c → stand/libofw/ofw_copy.c
View File

0
stand/ofw/libofw/ofw_disk.c → stand/libofw/ofw_disk.c
View File

0
stand/ofw/libofw/ofw_memory.c → stand/libofw/ofw_memory.c
View File

0
stand/ofw/libofw/ofw_module.c → stand/libofw/ofw_module.c
View File

0
stand/ofw/libofw/ofw_net.c → stand/libofw/ofw_net.c
View File

0
stand/ofw/libofw/ofw_reboot.c → stand/libofw/ofw_reboot.c
View File

0
stand/ofw/libofw/ofw_time.c → stand/libofw/ofw_time.c
View File

0
stand/ofw/libofw/openfirm.c → stand/libofw/openfirm.c
View File

0
stand/ofw/libofw/openfirm.h → stand/libofw/openfirm.h
View File

5
stand/ofw/Makefile
View File

@ -1,5 +0,0 @@
# $FreeBSD$
SUBDIR= libofw
.include <bsd.subdir.mk>

3
stand/ofw/Makefile.inc
View File

@ -1,3 +0,0 @@
# $FreeBSD$
.include "../Makefile.inc"

4
stand/powerpc/ofw/Makefile
View File

@ -44,8 +44,8 @@ CFLAGS+= -DRELOC=${RELOC} -g
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
# Open Firmware standalone support library # Open Firmware standalone support library
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a LIBOFW= ${BOOTOBJ}/libofw/libofw.a
CFLAGS+= -I${BOOTSRC}/ofw/libofw CFLAGS+= -I${BOOTSRC}/libofw
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}

4
stand/sparc64/loader/Makefile
View File

@ -47,8 +47,8 @@ LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
.endif .endif
# Open Firmware standalone support library # Open Firmware standalone support library
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a LIBOFW= ${BOOTOBJ}/libofw/libofw.a
CFLAGS+= -I${BOOTSRC}/ofw/libofw/ CFLAGS+= -I${BOOTSRC}/libofw
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA} DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}