From owner-svn-src-user@FreeBSD.ORG Wed Jul 4 12:57:35 2012 Return-Path: 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 96E1C106566B; Wed, 4 Jul 2012 12:57:35 +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 69B268FC12; Wed, 4 Jul 2012 12:57:35 +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 q64CvZDj011548; Wed, 4 Jul 2012 12:57:35 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q64CvZmE011544; Wed, 4 Jul 2012 12:57:35 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201207041257.q64CvZmE011544@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 4 Jul 2012 12:57:35 +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: r238098 - in user/ae/bootcode/sys/boot: arm/uboot common powerpc/uboot X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2012 12:57:35 -0000 Author: ae Date: Wed Jul 4 12:57:34 2012 New Revision: 238098 URL: http://svn.freebsd.org/changeset/base/238098 Log: Add an ability to build ubtldr without disks support for the arm and powerpc arches. Also simplify condition in the common code. Modified: user/ae/bootcode/sys/boot/arm/uboot/Makefile user/ae/bootcode/sys/boot/common/Makefile.inc user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Modified: user/ae/bootcode/sys/boot/arm/uboot/Makefile ============================================================================== --- user/ae/bootcode/sys/boot/arm/uboot/Makefile Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/arm/uboot/Makefile Wed Jul 4 12:57:34 2012 (r238098) @@ -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 @@ -36,12 +40,6 @@ 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 Modified: user/ae/bootcode/sys/boot/common/Makefile.inc ============================================================================== --- user/ae/bootcode/sys/boot/common/Makefile.inc Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/common/Makefile.inc Wed Jul 4 12:57:34 2012 (r238098) @@ -24,8 +24,7 @@ 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") +.if !defined(LOADER_NO_DISK_SUPPORT) SRCS+= disk.c part.c CFLAGS+= -DLOADER_DISK_SUPPORT .if !defined(LOADER_NO_GPT_SUPPORT) Modified: user/ae/bootcode/sys/boot/powerpc/uboot/Makefile ============================================================================== --- user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Wed Jul 4 12:57:34 2012 (r238098) @@ -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 @@ -29,12 +33,6 @@ 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