From owner-svn-src-head@FreeBSD.ORG  Sun Jun 13 12:46:32 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92B88106566C;
	Sun, 13 Jun 2010 12:46:32 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 688558FC1F;
	Sun, 13 Jun 2010 12:46:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5DCkWjs028614;
	Sun, 13 Jun 2010 12:46:32 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5DCkWna028610;
	Sun, 13 Jun 2010 12:46:32 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201006131246.o5DCkWna028610@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Sun, 13 Jun 2010 12:46:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209125 - in head/sys/boot: arm/uboot powerpc/uboot
	uboot/common
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jun 2010 12:46:32 -0000

Author: raj
Date: Sun Jun 13 12:46:32 2010
New Revision: 209125
URL: http://svn.freebsd.org/changeset/base/209125

Log:
  Fix conditional FDT support in loader(8).

Modified:
  head/sys/boot/arm/uboot/Makefile
  head/sys/boot/powerpc/uboot/Makefile
  head/sys/boot/uboot/common/metadata.c

Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile	Sun Jun 13 12:39:22 2010	(r209124)
+++ head/sys/boot/arm/uboot/Makefile	Sun Jun 13 12:46:32 2010	(r209125)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 BINDIR?=	/boot
@@ -18,7 +20,7 @@ LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
-.if defined(WITH_FDT)
+.if ${MK_FDT} != "no"
 LOADER_FDT_SUPPORT=	yes
 .else
 LOADER_FDT_SUPPORT=	no

Modified: head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/uboot/Makefile	Sun Jun 13 12:39:22 2010	(r209124)
+++ head/sys/boot/powerpc/uboot/Makefile	Sun Jun 13 12:46:32 2010	(r209125)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 BINDIR?=	/boot
@@ -18,7 +20,7 @@ LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
-.if defined(WITH_FDT)
+.if ${MK_FDT} != "no"
 LOADER_FDT_SUPPORT=	yes
 .else
 LOADER_FDT_SUPPORT=	no

Modified: head/sys/boot/uboot/common/metadata.c
==============================================================================
--- head/sys/boot/uboot/common/metadata.c	Sun Jun 13 12:39:22 2010	(r209124)
+++ head/sys/boot/uboot/common/metadata.c	Sun Jun 13 12:46:32 2010	(r209125)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/elf.h>
 #include <machine/metadata.h>
+#if !defined(LOADER_FDT_SUPPORT)
 #include <machine/bootinfo.h>
+#endif
 
 #include "api_public.h"
 #include "bootstrap.h"