From 99a4fb6cbc891bcee2267da411334d4b3a7720f7 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 23 Aug 2010 01:48:07 +0000
Subject: [PATCH] MF tbemd: move to using specific architecture makefiles

---
 sys/boot/Makefile            | 20 +-------------------
 sys/boot/Makefile.amd64      |  4 ++++
 sys/boot/Makefile.arm        |  3 +++
 sys/boot/Makefile.i386       |  4 ++++
 sys/boot/Makefile.ia64       |  3 +++
 sys/boot/Makefile.pc98       |  4 ++++
 sys/boot/Makefile.powerpc    |  4 ++++
 sys/boot/Makefile.sparc64    |  3 +++
 sys/boot/efi/libefi/Makefile |  2 +-
 9 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 sys/boot/Makefile.amd64
 create mode 100644 sys/boot/Makefile.arm
 create mode 100644 sys/boot/Makefile.i386
 create mode 100644 sys/boot/Makefile.ia64
 create mode 100644 sys/boot/Makefile.pc98
 create mode 100644 sys/boot/Makefile.powerpc
 create mode 100644 sys/boot/Makefile.sparc64

diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index b2eeb9554703..6c879972f928 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -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
diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64
new file mode 100644
index 000000000000..256201d4f940
--- /dev/null
+++ b/sys/boot/Makefile.amd64
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR+=		efi
+SUBDIR+=		zfs
diff --git a/sys/boot/Makefile.arm b/sys/boot/Makefile.arm
new file mode 100644
index 000000000000..f96104db47c5
--- /dev/null
+++ b/sys/boot/Makefile.arm
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=		uboot
diff --git a/sys/boot/Makefile.i386 b/sys/boot/Makefile.i386
new file mode 100644
index 000000000000..256201d4f940
--- /dev/null
+++ b/sys/boot/Makefile.i386
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR+=		efi
+SUBDIR+=		zfs
diff --git a/sys/boot/Makefile.ia64 b/sys/boot/Makefile.ia64
new file mode 100644
index 000000000000..921f2930d300
--- /dev/null
+++ b/sys/boot/Makefile.ia64
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=		efi
diff --git a/sys/boot/Makefile.pc98 b/sys/boot/Makefile.pc98
new file mode 100644
index 000000000000..aa989e1784bd
--- /dev/null
+++ b/sys/boot/Makefile.pc98
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+# Blank, to override Makefile.i386 since Makefile.$MACHINE is included before 
+# Makefile.$MACHINE_ARCH
diff --git a/sys/boot/Makefile.powerpc b/sys/boot/Makefile.powerpc
new file mode 100644
index 000000000000..ca8c33139b11
--- /dev/null
+++ b/sys/boot/Makefile.powerpc
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR+=		ofw
+SUBDIR+=		uboot
diff --git a/sys/boot/Makefile.sparc64 b/sys/boot/Makefile.sparc64
new file mode 100644
index 000000000000..5723629ba475
--- /dev/null
+++ b/sys/boot/Makefile.sparc64
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=		ofw
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 55053e1042f7..beb9269d0a25 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -7,7 +7,7 @@ SRCS=	delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
 	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