diff options
| -rw-r--r-- | sys/boot/ficl.mk | 2 | ||||
| -rw-r--r-- | sys/boot/loader.mk | 24 |
2 files changed, 8 insertions, 18 deletions
diff --git a/sys/boot/ficl.mk b/sys/boot/ficl.mk index 26d8156..a0a1320 100644 --- a/sys/boot/ficl.mk +++ b/sys/boot/ficl.mk @@ -6,7 +6,7 @@ .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1 FICL_CPUARCH= i386 -.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" +.elif ${MACHINE_ARCH:Mmips64*} != "" FICL_CPUARCH= mips64 .else FICL_CPUARCH= ${MACHINE_CPUARCH} diff --git a/sys/boot/loader.mk b/sys/boot/loader.mk index 13f7c21..66fc2ce 100644 --- a/sys/boot/loader.mk +++ b/sys/boot/loader.mk @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/boot/common ${SRCTOP}/sys/boot/libsa +.include "defs.mk" .PATH: ${LDRSRC} ${BOOTSRC}/libsa @@ -24,28 +24,18 @@ SRCS+= load_elf32.c reloc_elf32.c SRCS+= load_elf64.c reloc_elf64.c .elif ${MACHINE_CPUARCH} == "sparc64" SRCS+= load_elf64.c reloc_elf64.c -.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" +.elif ${MACHINE_ARCH:Mmips64*} != "" SRCS+= load_elf64.c reloc_elf64.c .elif ${MACHINE} == "mips" SRCS+= load_elf32.c reloc_elf32.c .endif -.if defined(LOADER_NET_SUPPORT) -SRCS+= dev_net.c -.endif - -.if !defined(LOADER_NO_DISK_SUPPORT) +.if ${LOADER_DISK_SUPPORT:Uyes} == "yes" SRCS+= disk.c part.c -CFLAGS+= -DLOADER_DISK_SUPPORT -.if !defined(LOADER_NO_GPT_SUPPORT) -CFLAGS+= -DLOADER_GPT_SUPPORT -.endif -.if !defined(LOADER_NO_MBR_SUPPORT) -CFLAGS+= -DLOADER_MBR_SUPPORT .endif -.endif -.if !defined(LOADER_NO_GELI_SUPPORT) -CFLAGS+= -DLOADER_GELI_SUPPORT + +.if ${LOADER_NET_SUPPORT:Uno} == "yes" +SRCS+= dev_net.c .endif .if defined(HAVE_BCACHE) @@ -68,7 +58,7 @@ SRCS+= pnp.c .endif # Forth interpreter -.if defined(MK_FORTH) +.if ${MK_FORTH} != "no" SRCS+= interp_forth.c .include "${BOOTSRC}/ficl.mk" .endif |
