diff options
-rw-r--r-- | sys/boot/Makefile | 20 | ||||
-rw-r--r-- | sys/boot/Makefile.amd64 | 4 | ||||
-rw-r--r-- | sys/boot/Makefile.arm | 3 | ||||
-rw-r--r-- | sys/boot/Makefile.i386 | 4 | ||||
-rw-r--r-- | sys/boot/Makefile.ia64 | 3 | ||||
-rw-r--r-- | sys/boot/Makefile.pc98 | 4 | ||||
-rw-r--r-- | sys/boot/Makefile.powerpc | 4 | ||||
-rw-r--r-- | sys/boot/Makefile.sparc64 | 3 | ||||
-rw-r--r-- | sys/boot/efi/libefi/Makefile | 2 |
9 files changed, 27 insertions, 20 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index b2eeb95..6c87997 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 0000000..256201d --- /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 0000000..f96104d --- /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 0000000..256201d --- /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 0000000..921f293 --- /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 0000000..aa989e1 --- /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 0000000..ca8c331 --- /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 0000000..5723629 --- /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 55053e1..beb9269 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 |