From owner-svn-src-all@FreeBSD.ORG Mon Aug 23 01:48:07 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E97E106566C; Mon, 23 Aug 2010 01:48:07 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D9BE8FC08; Mon, 23 Aug 2010 01:48:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7N1m7lH023347; Mon, 23 Aug 2010 01:48:07 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7N1m7rx023337; Mon, 23 Aug 2010 01:48:07 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201008230148.o7N1m7rx023337@svn.freebsd.org> From: Warner Losh Date: Mon, 23 Aug 2010 01:48:07 +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: r211679 - in head/sys/boot: . efi/libefi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2010 01:48:07 -0000 Author: imp Date: Mon Aug 23 01:48:07 2010 New Revision: 211679 URL: http://svn.freebsd.org/changeset/base/211679 Log: MF tbemd: move to using specific architecture makefiles Added: head/sys/boot/Makefile.amd64 (contents, props changed) head/sys/boot/Makefile.arm (contents, props changed) head/sys/boot/Makefile.i386 (contents, props changed) head/sys/boot/Makefile.ia64 (contents, props changed) head/sys/boot/Makefile.pc98 (contents, props changed) head/sys/boot/Makefile.powerpc (contents, props changed) head/sys/boot/Makefile.sparc64 (contents, props changed) Modified: head/sys/boot/Makefile head/sys/boot/efi/libefi/Makefile Modified: head/sys/boot/Makefile ============================================================================== --- head/sys/boot/Makefile Mon Aug 23 01:43:47 2010 (r211678) +++ head/sys/boot/Makefile Mon Aug 23 01:48:07 2010 (r211679) @@ -1,31 +1,13 @@ # $FreeBSD$ .include +.include .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl .endif -# Build EFI library. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64" -SUBDIR+= efi -.endif - -# Build Open Firmware library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "sparc64" -SUBDIR+= ofw -.endif - -# Build U-Boot library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "arm" -SUBDIR+= uboot -.endif - -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" -SUBDIR+= zfs -.endif - .if ${MK_FDT} != "no" SUBDIR+= fdt .endif Added: head/sys/boot/Makefile.amd64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.amd64 Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR+= efi +SUBDIR+= zfs Added: head/sys/boot/Makefile.arm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.arm Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= uboot Added: head/sys/boot/Makefile.i386 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.i386 Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR+= efi +SUBDIR+= zfs Added: head/sys/boot/Makefile.ia64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.ia64 Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= efi Added: head/sys/boot/Makefile.pc98 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.pc98 Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +# Blank, to override Makefile.i386 since Makefile.$MACHINE is included before +# Makefile.$MACHINE_ARCH Added: head/sys/boot/Makefile.powerpc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.powerpc Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR+= ofw +SUBDIR+= uboot Added: head/sys/boot/Makefile.sparc64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/Makefile.sparc64 Mon Aug 23 01:48:07 2010 (r211679) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= ofw Modified: head/sys/boot/efi/libefi/Makefile ============================================================================== --- head/sys/boot/efi/libefi/Makefile Mon Aug 23 01:43:47 2010 (r211678) +++ head/sys/boot/efi/libefi/Makefile Mon Aug 23 01:48:07 2010 (r211679) @@ -7,7 +7,7 @@ SRCS= delay.c efi_console.c efinet.c efi libefi.c time.c CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_CPUARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items