From owner-svn-src-user@FreeBSD.ORG  Fri Jun 29 08:41:14 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7CA99106564A;
	Fri, 29 Jun 2012 08:41:14 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 682058FC14;
	Fri, 29 Jun 2012 08:41:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5T8fEFB029061;
	Fri, 29 Jun 2012 08:41:14 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5T8fEnv029059;
	Fri, 29 Jun 2012 08:41:14 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201206290841.q5T8fEnv029059@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 29 Jun 2012 08:41:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237750 - user/ae/bootcode/sys/boot/arm/uboot
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 08:41:14 -0000

Author: ae
Date: Fri Jun 29 08:41:13 2012
New Revision: 237750
URL: http://svn.freebsd.org/changeset/base/237750

Log:
  Turn on the build of MBR and GPT support in the arm/uboot.

Modified:
  user/ae/bootcode/sys/boot/arm/uboot/Makefile

Modified: user/ae/bootcode/sys/boot/arm/uboot/Makefile
==============================================================================
--- user/ae/bootcode/sys/boot/arm/uboot/Makefile	Fri Jun 29 08:39:30 2012	(r237749)
+++ user/ae/bootcode/sys/boot/arm/uboot/Makefile	Fri Jun 29 08:41:13 2012	(r237750)
@@ -36,6 +36,12 @@ LOADER_FDT_SUPPORT=	no
 
 .if ${LOADER_DISK_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_DISK_SUPPORT
+.if !defined(LOADER_NO_MBR_SUPPORT)
+CFLAGS+=	-DLOADER_MBR_SUPPORT
+.endif
+.if !defined(LOADER_NO_GPT_SUPPORT)
+CFLAGS+=	-DLOADER_GPT_SUPPORT
+.endif
 .endif
 .if ${LOADER_UFS_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_UFS_SUPPORT