From owner-svn-src-user@FreeBSD.ORG  Wed Jul  4 12:04:50 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 D3ABD1065686;
	Wed,  4 Jul 2012 12:04:50 +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 BF8C88FC1D;
	Wed,  4 Jul 2012 12:04:50 +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 q64C4oqp009256;
	Wed, 4 Jul 2012 12:04:50 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q64C4oNT009253;
	Wed, 4 Jul 2012 12:04:50 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201207041204.q64C4oNT009253@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 4 Jul 2012 12:04:50 +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: r238096 - user/ae/bootcode/sys/boot/common
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:04:51 -0000

Author: ae
Date: Wed Jul  4 12:04:50 2012
New Revision: 238096
URL: http://svn.freebsd.org/changeset/base/238096

Log:
  Don't build disk.c and part.c if LOADER_DISK_SUPPORT is "no" or
  LOADER_NO_DISK_SUPPORT is set. Some loaders might work without disks
  support, so we don't need these files.

Modified:
  user/ae/bootcode/sys/boot/common/Makefile.inc

Modified: user/ae/bootcode/sys/boot/common/Makefile.inc
==============================================================================
--- user/ae/bootcode/sys/boot/common/Makefile.inc	Wed Jul  4 10:17:02 2012	(r238095)
+++ user/ae/bootcode/sys/boot/common/Makefile.inc	Wed Jul  4 12:04:50 2012	(r238096)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SRCS+=	boot.c commands.c console.c devopen.c disk.c interp.c 
+SRCS+=	boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
-SRCS+=	module.c panic.c part.c
+SRCS+=	module.c panic.c
 
 .if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
@@ -24,8 +24,17 @@ SRCS+=	load_elf64.c reloc_elf64.c
 SRCS+=	dev_net.c
 .endif
 
+.if !defined(LOADER_NO_DISK_SUPPORT) ||
+    (defined(LOADER_DISK_SUPPORT) && ${LOADER_DISK_SUPPORT} != "no")
+SRCS+=	disk.c part.c
+CFLAGS+= -DLOADER_DISK_SUPPORT
 .if !defined(LOADER_NO_GPT_SUPPORT)
 SRCS+=	crc32.c
+CFLAGS+= -DLOADER_GPT_SUPPORT
+.endif
+.if !defined(LOADER_NO_MBR_SUPPORT)
+CFLAGS+= -DLOADER_MBR_SUPPORT
+.endif
 .endif
 
 .if defined(HAVE_BCACHE)