From owner-svn-src-head@FreeBSD.ORG  Sun Sep  9 11:40:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B48CB106566B;
	Sun,  9 Sep 2012 11:40:37 +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 A06708FC23;
	Sun,  9 Sep 2012 11:40:37 +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 q89BebQG066267;
	Sun, 9 Sep 2012 11:40:37 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q89Bebt0066264;
	Sun, 9 Sep 2012 11:40:37 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201209091140.q89Bebt0066264@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sun, 9 Sep 2012 11:40:37 +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: r240277 - in head/sys/boot: arm/uboot powerpc/uboot
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, 09 Sep 2012 11:40:37 -0000

Author: ae
Date: Sun Sep  9 11:40:37 2012
New Revision: 240277
URL: http://svn.freebsd.org/changeset/base/240277

Log:
  Handle LOADER_NO_DISK_SUPPORT knob in the arm and powerpc ubldr.

Modified:
  head/sys/boot/arm/uboot/Makefile
  head/sys/boot/powerpc/uboot/Makefile

Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile	Sun Sep  9 11:37:17 2012	(r240276)
+++ head/sys/boot/arm/uboot/Makefile	Sun Sep  9 11:40:37 2012	(r240277)
@@ -14,7 +14,11 @@ UBLDR_LOADADDR?=	0x1000000
 # Architecture-specific loader code
 SRCS=		start.S conf.c vers.c
 
+.if !defined(LOADER_NO_DISK_SUPPORT)
 LOADER_DISK_SUPPORT?=	yes
+.else
+LOADER_DISK_SUPPORT=	no
+.endif
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no

Modified: head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/uboot/Makefile	Sun Sep  9 11:37:17 2012	(r240276)
+++ head/sys/boot/powerpc/uboot/Makefile	Sun Sep  9 11:40:37 2012	(r240277)
@@ -12,7 +12,11 @@ NO_MAN=
 SRCS=		start.S conf.c vers.c
 SRCS+=		ucmpdi2.c
 
+.if !defined(LOADER_NO_DISK_SUPPORT)
 LOADER_DISK_SUPPORT?=	yes
+.else
+LOADER_DISK_SUPPORT=	no
+.endif
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no