svn commit: r329131 - in stable/11/sys/boot: . arm/uboot common efi/fdt efi/libefi efi/loader fdt i386/libfirewire i386/libi386 i386/loader mips/beri/boot2 mips/beri/loader mips/uboot ofw/libofw po...

Sun Feb 11 19:35:46 UTC 2018

Author: kevans
Date: Sun Feb 11 19:35:42 2018
New Revision: 329131
URL: https://svnweb.freebsd.org/changeset/base/329131

Log:
  MFC Loader Fixes 2017q4p3: r324460,r324471
  
  r324460: Rather than laying whack-a-mole with including the path to stand.h,
  always include it.
  
  r324471: Fix typos: `stand alon{e,g}` should be spelled like `standalone`

Modified:
  stable/11/sys/boot/Makefile.ficl
  stable/11/sys/boot/Makefile.inc
  stable/11/sys/boot/arm/uboot/Makefile
  stable/11/sys/boot/common/Makefile.inc
  stable/11/sys/boot/efi/fdt/Makefile
  stable/11/sys/boot/efi/libefi/Makefile
  stable/11/sys/boot/efi/loader/Makefile
  stable/11/sys/boot/fdt/Makefile
  stable/11/sys/boot/i386/libfirewire/Makefile
  stable/11/sys/boot/i386/libi386/Makefile
  stable/11/sys/boot/i386/loader/Makefile
  stable/11/sys/boot/mips/beri/boot2/Makefile
  stable/11/sys/boot/mips/beri/loader/Makefile
  stable/11/sys/boot/mips/uboot/Makefile
  stable/11/sys/boot/ofw/libofw/Makefile
  stable/11/sys/boot/powerpc/kboot/Makefile
  stable/11/sys/boot/powerpc/ofw/Makefile
  stable/11/sys/boot/powerpc/ps3/Makefile
  stable/11/sys/boot/powerpc/uboot/Makefile
  stable/11/sys/boot/sparc64/loader/Makefile
  stable/11/sys/boot/uboot/fdt/Makefile
  stable/11/sys/boot/uboot/lib/Makefile
  stable/11/sys/boot/userboot/userboot/Makefile
  stable/11/sys/boot/zfs/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/Makefile.ficl
==============================================================================

--- stable/11/sys/boot/Makefile.ficl	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/Makefile.ficl	Sun Feb 11 19:35:42 2018	(r329131)
@@ -27,7 +27,7 @@ CFLAGS+=	-m32 -mcpu=powerpc -I.
 .endif
 
 CFLAGS+=	-I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \
-		-I${FICLDIR}/../common -I${SASRC}
+		-I${FICLDIR}/../common
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 .if !exists(machine)

Modified: stable/11/sys/boot/Makefile.inc
==============================================================================
--- stable/11/sys/boot/Makefile.inc	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/Makefile.inc	Sun Feb 11 19:35:42 2018	(r329131)
@@ -6,12 +6,14 @@
 __BOOT_MAKEFILE_INC__=${MFILE}
 
 SASRC=${SRCTOP}/lib/libstand
-# Normal stand alone library
+# Normal standalone library
 LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a
-# stand alone library compiled for 32-bit version of the processor
+# Standalone library compiled for 32-bit version of the processor
 LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
-# stand along library compiled for userboot
+# Standalone library compiled for userboot
 LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a
+
+CFLAGS+=-I${SASRC}
 
 SSP_CFLAGS=
 

Modified: stable/11/sys/boot/arm/uboot/Makefile
==============================================================================
--- stable/11/sys/boot/arm/uboot/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/arm/uboot/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -112,8 +112,6 @@ LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=	-I${.CURDIR}/../../uboot/lib
 CFLAGS+=	-I${.OBJDIR}/../../uboot/lib
 
-CFLAGS+=	-I${SASRC}
-
 CFLAGS+=	-fPIC
 
 # clang doesn't understand %D as a specifier to printf

Modified: stable/11/sys/boot/common/Makefile.inc
==============================================================================
--- stable/11/sys/boot/common/Makefile.inc	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/common/Makefile.inc	Sun Feb 11 19:35:42 2018	(r329131)
@@ -74,7 +74,6 @@ CFLAGS+=	-DBOOT_PROMPT_123
 
 .if defined(LOADER_INSTALL_SUPPORT)
 SRCS+=	install.c
-CFLAGS+=-I${SASRC}
 .endif
 
 CLEANFILES+=	vers.c

Modified: stable/11/sys/boot/efi/fdt/Makefile
==============================================================================
--- stable/11/sys/boot/efi/fdt/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/efi/fdt/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -17,8 +17,6 @@ CFLAGS+=	-mgeneral-regs-only
 CFLAGS+=	-msoft-float
 .endif
 
-CFLAGS+=	-I${SASRC}
-
 # EFI library headers
 CFLAGS+=	-I${.CURDIR}/../include
 CFLAGS+=	-I${.CURDIR}/../include/${MACHINE}

Modified: stable/11/sys/boot/efi/libefi/Makefile
==============================================================================
--- stable/11/sys/boot/efi/libefi/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/efi/libefi/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -37,7 +37,6 @@ CFLAGS+= -fPIC -mno-red-zone
 .endif
 CFLAGS+= -I${.CURDIR}/../include
 CFLAGS+= -I${.CURDIR}/../include/${MACHINE}
-CFLAGS+= -I${SASRC}
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-I${.CURDIR}/../../zfs
 CFLAGS+=	-I${.CURDIR}/../../../cddl/boot/zfs

Modified: stable/11/sys/boot/efi/loader/Makefile
==============================================================================
--- stable/11/sys/boot/efi/loader/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/efi/loader/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -36,10 +36,6 @@ CWARNFLAGS.zfs.c+=	-Wno-array-bounds
 CWARNFLAGS.zfs.c+=	-Wno-missing-prototypes
 .endif
 
-.if defined(LOADER_NET_SUPPORT)
-CFLAGS+=	-I${SASRC}
-.endif
-
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201
 CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
 .endif

Modified: stable/11/sys/boot/fdt/Makefile
==============================================================================
--- stable/11/sys/boot/fdt/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/fdt/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -12,7 +12,6 @@ SRCS+=		fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt
 # Loader's fdt commands extension sources.
 SRCS+=		fdt_loader_cmd.c
 
-CFLAGS+=	-I${SASRC}
 CFLAGS+=	-I${.CURDIR}/../../contrib/libfdt/ -I${.CURDIR}/../common/
 
 CFLAGS+=	-ffreestanding

Modified: stable/11/sys/boot/i386/libfirewire/Makefile
==============================================================================
--- stable/11/sys/boot/i386/libfirewire/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/i386/libfirewire/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -10,7 +10,6 @@ SRCS+=		dcons.c fwcrom.c
 CFLAGS+=	-D_BOOT
 
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-CFLAGS+=	-I${SASRC}
 CFLAGS+=	-I${.CURDIR}/../btx/lib
 CFLAGS+=	-I${.CURDIR}/../libi386
 

Modified: stable/11/sys/boot/i386/libi386/Makefile
==============================================================================
--- stable/11/sys/boot/i386/libi386/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/i386/libi386/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -59,8 +59,6 @@ CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../fi
 		-I${.CURDIR}/../btx/lib \
 		-I${.CURDIR}/../../../contrib/dev/acpica/include \
 		-I${.CURDIR}/../../.. -I.
-# the location of libstand
-CFLAGS+=	-I${SASRC}
 
 # Handle FreeBSD specific %b and %D printf format specifiers
 CFLAGS+= ${FORMAT_EXTENSIONS}

Modified: stable/11/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/11/sys/boot/i386/loader/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/i386/loader/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -28,10 +28,6 @@ CFLAGS+=	-DLOADER_ZFS_SUPPORT
 LIBZFSBOOT=	${.OBJDIR}/../../zfs/libzfsboot.a
 .endif
 
-.if defined(LOADER_NET_SUPPORT)
-CFLAGS+=	-I${SASRC}
-.endif
-
 .if defined(LOADER_TFTP_SUPPORT)
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif

Modified: stable/11/sys/boot/mips/beri/boot2/Makefile
==============================================================================
--- stable/11/sys/boot/mips/beri/boot2/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/mips/beri/boot2/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -57,9 +57,6 @@ CFLAGS=		-ffreestanding			\
 		-msoft-float			\
 		-g
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 LDFLAGS=	-nostdlib			\
 		-static				\
 		-Wl,-N				\

Modified: stable/11/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- stable/11/sys/boot/mips/beri/loader/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/mips/beri/loader/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -107,9 +107,6 @@ LDFLAGS=	-nostdlib				\
 		-L${.CURDIR}				\
 		-e __start
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 DPADD=		${LIBFICL} ${LIBSA}
 LDADD=		${LIBFICL} ${LIBSA}
 

Modified: stable/11/sys/boot/mips/uboot/Makefile
==============================================================================
--- stable/11/sys/boot/mips/uboot/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/mips/uboot/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -115,9 +115,6 @@ LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=	-I${.CURDIR}/../../uboot/lib
 CFLAGS+=	-I${.OBJDIR}/../../uboot/lib
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 # clang doesn't understand %D as a specifier to printf
 #NO_WERROR.clang=
 #NO_WERROR=

Modified: stable/11/sys/boot/ofw/libofw/Makefile
==============================================================================
--- stable/11/sys/boot/ofw/libofw/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/ofw/libofw/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -9,8 +9,6 @@ SRCS=	devicename.c elf_freebsd.c ofw_console.c ofw_cop
 .PATH:	${.CURDIR}/../../zfs
 SRCS+=  devicename_stubs.c
 
-CFLAGS+=	-I${SASRC}
-
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
 

Modified: stable/11/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- stable/11/sys/boot/powerpc/kboot/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/powerpc/kboot/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -93,9 +93,6 @@ CFLAGS+= -Wa,-mppc64bridge
 #.PATH:		${.CURDIR}/../../ofw/common
 #.include	"${.CURDIR}/../../ofw/common/Makefile.inc"
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 DPADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
 LDADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
 

Modified: stable/11/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- stable/11/sys/boot/powerpc/ofw/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/powerpc/ofw/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -91,9 +91,6 @@ LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powe
 LIBOFW=		${.OBJDIR}/../../ofw/libofw/libofw.a
 CFLAGS+=	-I${.CURDIR}/../../ofw/libofw
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 DPADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
 LDADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
 

Modified: stable/11/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- stable/11/sys/boot/powerpc/ps3/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/powerpc/ps3/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -90,9 +90,6 @@ LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powe
 #.PATH:		${.CURDIR}/../../ofw/common
 #.include	"${.CURDIR}/../../ofw/common/Makefile.inc"
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 DPADD=		${LIBFICL} ${LIBOFW} ${LIBSA32}
 LDADD=		${LIBFICL} ${LIBOFW} ${LIBSA32}
 

Modified: stable/11/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- stable/11/sys/boot/powerpc/uboot/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/powerpc/uboot/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -96,9 +96,6 @@ LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=	-I${.CURDIR}/../../uboot/lib
 CFLAGS+=	-I${.OBJDIR}/../../uboot/lib
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
 LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
 

Modified: stable/11/sys/boot/sparc64/loader/Makefile
==============================================================================
--- stable/11/sys/boot/sparc64/loader/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/sparc64/loader/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -79,9 +79,6 @@ LDFLAGS=	-static
 LIBOFW=		${.OBJDIR}/../../ofw/libofw/libofw.a
 CFLAGS+=	-I${.CURDIR}/../../ofw/libofw/
 
-# where to get libstand from
-CFLAGS+=	-I${SASRC}
-
 # Need sys/ for crypto/intake.h
 CFLAGS+=	-I${SRCTOP}/sys
 

Modified: stable/11/sys/boot/uboot/fdt/Makefile
==============================================================================
--- stable/11/sys/boot/uboot/fdt/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/uboot/fdt/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -12,8 +12,6 @@ SRCS=		uboot_fdt.c
 
 CFLAGS+=	-ffreestanding -msoft-float
 
-CFLAGS+=	-I${SASRC}
-
 # U-Boot library headers
 CFLAGS+=	-I${.CURDIR}/../lib
 

Modified: stable/11/sys/boot/uboot/lib/Makefile
==============================================================================
--- stable/11/sys/boot/uboot/lib/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/uboot/lib/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -13,8 +13,6 @@ SRCS+=	module.c net.c reboot.c time.c
 
 CFLAGS+=	-ffreestanding -msoft-float
 
-CFLAGS+=	-I${SASRC}
-
 .if !defined(LOADER_NO_DISK_SUPPORT)
 SRCS+=	disk.c
 CFLAGS+= -DLOADER_DISK_SUPPORT

Modified: stable/11/sys/boot/userboot/userboot/Makefile
==============================================================================
--- stable/11/sys/boot/userboot/userboot/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/userboot/userboot/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -32,7 +32,6 @@ CFLAGS+=	-Wall
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I${.CURDIR}/../../..
-CFLAGS+=	-I${SASRC}
 CFLAGS+=	-ffreestanding -I.
 
 CWARNFLAGS.main.c += -Wno-implicit-function-declaration

Modified: stable/11/sys/boot/zfs/Makefile
==============================================================================
--- stable/11/sys/boot/zfs/Makefile	Sun Feb 11 19:33:24 2018	(r329130)
+++ stable/11/sys/boot/zfs/Makefile	Sun Feb 11 19:35:42 2018	(r329131)
@@ -12,7 +12,6 @@ CFLAGS+=	-DSKEIN_LOOP=111
 
 CFLAGS+=	-DBOOTPROG=\"zfsloader\"
 CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
-CFLAGS+=	-I${SASRC}
 CFLAGS+=	-I${.CURDIR}/../../cddl/boot/zfs
 CFLAGS+=	-I${.CURDIR}/../../crypto/skein
 
