svn commit: r211679 - in head/sys/boot: . efi/libefi

[Warner Losh]

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 <bsd.own.mk>
+.include <bsd.arch.inc.mk>
 
 .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