From owner-svn-src-user@FreeBSD.ORG  Wed Jul  4 12:54:57 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B246106564A;
	Wed,  4 Jul 2012 12:54:57 +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 6D4788FC17;
	Wed,  4 Jul 2012 12:54:57 +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 q64CsvQU011345;
	Wed, 4 Jul 2012 12:54:57 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q64CsvH6011342;
	Wed, 4 Jul 2012 12:54:57 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201207041254.q64CsvH6011342@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 4 Jul 2012 12:54:57 +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: r238097 - user/ae/bootcode/sys/boot/uboot/lib
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: Wed, 04 Jul 2012 12:54:57 -0000

Author: ae
Date: Wed Jul  4 12:54:56 2012
New Revision: 238097
URL: http://svn.freebsd.org/changeset/base/238097

Log:
  Don't build storage.c if LOADER_NO_DISK_SUPPORT is defined.
  Also hide disk_xxx calls under ifdefs.

Modified:
  user/ae/bootcode/sys/boot/uboot/lib/Makefile
  user/ae/bootcode/sys/boot/uboot/lib/devicename.c

Modified: user/ae/bootcode/sys/boot/uboot/lib/Makefile
==============================================================================
--- user/ae/bootcode/sys/boot/uboot/lib/Makefile	Wed Jul  4 12:04:50 2012	(r238096)
+++ user/ae/bootcode/sys/boot/uboot/lib/Makefile	Wed Jul  4 12:54:56 2012	(r238097)
@@ -7,7 +7,7 @@ INTERNALLIB=
 WARNS?=		2
 
 SRCS=	crc32.c console.c copy.c devicename.c elf_freebsd.c glue.c
-SRCS+=	module.c net.c reboot.c storage.c time.c
+SRCS+=	module.c net.c reboot.c time.c
 
 CFLAGS+=	-ffreestanding -msoft-float
 
@@ -19,6 +19,11 @@ CFLAGS+=	-I${.CURDIR}/../../../../sys/co
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
 
+.if !defined(LOADER_NO_DISK_SUPPORT)
+SRCS+=	storage.c
+CFLAGS+= -DLOADER_DISK_SUPPORT
+.endif
+
 .ifdef(BOOT_DISK_DEBUG)
 # Make the disk code more talkative
 CFLAGS+= -DDISK_DEBUG

Modified: user/ae/bootcode/sys/boot/uboot/lib/devicename.c
==============================================================================
--- user/ae/bootcode/sys/boot/uboot/lib/devicename.c	Wed Jul  4 12:04:50 2012	(r238096)
+++ user/ae/bootcode/sys/boot/uboot/lib/devicename.c	Wed Jul  4 12:54:56 2012	(r238097)
@@ -113,11 +113,13 @@ uboot_parsedev(struct uboot_devdesc **de
 	case DEVT_NONE:
 		break;
 
+#ifdef LOADER_DISK_SUPPORT
 	case DEVT_DISK:
 		err = disk_parsedev((struct disk_devdesc *)idev, np, path);
 		if (err != 0)
 			goto fail;
 		break;
+#endif
 
 	case DEVT_NET:
 		unit = 0;
@@ -171,7 +173,9 @@ uboot_fmtdev(void *vdev)
 		break;
 
 	case DEVT_DISK:
+#ifdef LOADER_DISK_SUPPORT
 		return (disk_fmtdev(vdev));
+#endif
 
 	case DEVT_NET:
 		sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);