Move loader help file definitions to being 100% inside of loader.mk.
HELP_FILES is a loader only thing, so move it to loader.mk. Only generate the help file if HELP_FILES is defined. Adjust Makefiles to new convention. Fix a few cases where ${.CURDIR}/ was missing resulting in missing bits from the help files. Sponsored by: Netflix
This commit is contained in:
parent
b5496277c7
commit
25c2f4cb95
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=326926
@ -28,7 +28,7 @@ SRCS= start.S conf.c self_reloc.c vers.c
|
|||||||
CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized
|
CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
HELP_FILES+= help.uboot ${BOOTSRC}/fdt/help.fdt
|
HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
|
@ -170,8 +170,4 @@ ${_ILINKS}:
|
|||||||
${ECHO} ${.TARGET:T} "->" $$path ; \
|
${ECHO} ${.TARGET:T} "->" $$path ; \
|
||||||
ln -fhs $$path ${.TARGET:T}
|
ln -fhs $$path ${.TARGET:T}
|
||||||
|
|
||||||
# For loader implementations, we generate a loader.help file. This can be suppressed by
|
|
||||||
# setting HELP_FILES to nothing.
|
|
||||||
HELP_FILES= ${LDRSRC}/help.common
|
|
||||||
|
|
||||||
.endif # __BOOT_DEFS_MK__
|
.endif # __BOOT_DEFS_MK__
|
||||||
|
@ -83,7 +83,6 @@ CFLAGS+= -DEFI_STAGING_SIZE=${EFI_STAGING_SIZE}
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
HELP_FILES=
|
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
|
|
||||||
FILES+= loader.efi
|
FILES+= loader.efi
|
||||||
|
@ -41,9 +41,7 @@ LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if exists(${.CURDIR}/help.i386)
|
.if exists(${.CURDIR}/help.i386)
|
||||||
HELP_FILES+= help.i386
|
HELP_FILES= ${.CURDIR}/help.i386
|
||||||
.else
|
|
||||||
HELP_FILES=
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
|
@ -139,6 +139,8 @@ vers.c: ${LDRSRC}/newvers.sh ${VERSION_FILE}
|
|||||||
${NEWVERSWHAT}
|
${NEWVERSWHAT}
|
||||||
|
|
||||||
.if !empty(HELP_FILES)
|
.if !empty(HELP_FILES)
|
||||||
|
HELP_FILES+= ${LDRSRC}/help.common
|
||||||
|
|
||||||
CLEANFILES+= loader.help
|
CLEANFILES+= loader.help
|
||||||
FILES+= loader.help
|
FILES+= loader.help
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ SRCS+= altera_jtag_uart.c \
|
|||||||
# Since we don't have a backward compatibility issue, default to this on BERI.
|
# Since we don't have a backward compatibility issue, default to this on BERI.
|
||||||
CFLAGS+= -DBOOT_PROMPT_123
|
CFLAGS+= -DBOOT_PROMPT_123
|
||||||
|
|
||||||
HELP_FILES+= ${.CURDIR}/help.mips
|
HELP_FILES= ${.CURDIR}/help.mips
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
|
@ -24,7 +24,7 @@ UBLDR_LOADADDR?= 0xffffffff80800000
|
|||||||
# Architecture-specific loader code
|
# Architecture-specific loader code
|
||||||
SRCS= start.S conf.c vers.c
|
SRCS= start.S conf.c vers.c
|
||||||
|
|
||||||
HELP_FILES+= help.uboot ${BOOTSRC}/fdt/help.fdt
|
HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
|
@ -28,7 +28,6 @@ SRCS+= ucmpdi2.c
|
|||||||
CFLAGS+= -mcpu=powerpc64
|
CFLAGS+= -mcpu=powerpc64
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
HELP_FILES= # Disable
|
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
.PATH: ${SYSDIR}/libkern
|
.PATH: ${SYSDIR}/libkern
|
||||||
|
|
||||||
@ -45,6 +44,4 @@ CFLAGS+= -Wa,-mppc64bridge
|
|||||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
|
|
||||||
HELP_FILES+= ${FDTSRC}/help.fdt
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -27,7 +27,7 @@ SRCS+= ucmpdi2.c
|
|||||||
SRCS+= ofwfdt.c
|
SRCS+= ofwfdt.c
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
HELP_FILES+= ${FDTSRC}/help.fdt
|
HELP_FILES= ${FDTSRC}/help.fdt
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
|
@ -26,7 +26,6 @@ SRCS+= ucmpdi2.c
|
|||||||
CFLAGS+= -mcpu=powerpc64
|
CFLAGS+= -mcpu=powerpc64
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
HELP_FILES= # Disable
|
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
.PATH: ${SYSDIR}/libkern
|
.PATH: ${SYSDIR}/libkern
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@ SRCS= start.S conf.c vers.c
|
|||||||
SRCS+= ucmpdi2.c
|
SRCS+= ucmpdi2.c
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
HELP_FILES= # Disable
|
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
.PATH: ${SYSDIR}/libkern
|
.PATH: ${SYSDIR}/libkern
|
||||||
|
|
||||||
|
@ -30,9 +30,7 @@ CFLAGS+= -DLOADER_DEBUG
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if exists(${.CURDIR}/help.sparc64)
|
.if exists(${.CURDIR}/help.sparc64)
|
||||||
HELP_FILES+= help.sparc64
|
HELP_FILES= ${.CURDIR}/help.sparc64
|
||||||
.else
|
|
||||||
HELP_FILES=
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
|
@ -49,7 +49,6 @@ LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
HELP_FILES= # Disable
|
|
||||||
.include "${BOOTSRC}/loader.mk"
|
.include "${BOOTSRC}/loader.mk"
|
||||||
CFLAGS+= -I.
|
CFLAGS+= -I.
|
||||||
DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
|
DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
|
||||||
|
Loading…
Reference in New Issue
Block a user