svn commit: r278604 - in stable/10/sys/boot: arm/uboot powerpc/uboot

[Ian Lepore]

Author: ian
Date: Wed Feb 11 23:05:58 2015
New Revision: 278604
URL: https://svnweb.freebsd.org/changeset/base/278604

Log:
  MFC r276145:  Convert lingering NO_FORTH conditionals to test MK_FORTH.

Modified:
  stable/10/sys/boot/arm/uboot/Makefile
  stable/10/sys/boot/powerpc/uboot/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/arm/uboot/Makefile
==============================================================================
--- stable/10/sys/boot/arm/uboot/Makefile	Wed Feb 11 22:59:24 2015	(r278603)
+++ stable/10/sys/boot/arm/uboot/Makefile	Wed Feb 11 23:05:58 2015	(r278604)
@@ -76,7 +76,7 @@ LIBUBOOT_FDT=	${.OBJDIR}/../../uboot/fdt
 LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .endif
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm

Modified: stable/10/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/uboot/Makefile	Wed Feb 11 22:59:24 2015	(r278603)
+++ stable/10/sys/boot/powerpc/uboot/Makefile	Wed Feb 11 23:05:58 2015	(r278604)
@@ -66,7 +66,7 @@ LIBUBOOT_FDT=	${.OBJDIR}/../../uboot/fdt
 LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .endif
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc