diff options
| author |   jsg <jsg@openbsd.org> | 2016-05-23 02:19:46 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2016-05-23 02:19:46 +0000 |
| commit | fda7d76ff809c100b157147097a022c3dd2fcaf1 (patch) | |
| tree | e9db17c62724011d6bac3e32758e7c451c0d48b2 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-fda7d76ff809c100b157147097a022c3dd2fcaf1.tar.xz wireguard-openbsd-fda7d76ff809c100b157147097a022c3dd2fcaf1.zip | |
build armv7 efiboot
| -rw-r--r-- | etc/etc.armv7/Makefile.inc | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/Makefile | 12 |
4 files changed, 20 insertions, 6 deletions
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc index f66591dc0b8..2b48a22b5e9 100644 --- a/etc/etc.armv7/Makefile.inc +++ b/etc/etc.armv7/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.12 2015/08/01 00:15:37 jsg Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2016/05/23 02:19:46 jsg Exp $ ALLSOC=EXYNOS IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15 -MDEXT= bsd.rd +MDEXT= bsd.rd BOOTARM.EFI .for SOC in ${ALLSOC} MDEXT+= bsd.${SOC}.umg @@ -16,6 +16,7 @@ KERNADDR_VEXPRESSA9=0x60300000 KERNADDR_EXYNOS=0x40300000 bootblocks: + cp ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR} kernels: bootblocks ${ALL_KERNELS} .for CONF K in ${KERNELS} diff --git a/sys/arch/armv7/Makefile b/sys/arch/armv7/Makefile index a19d094049e..ea6eb39209a 100644 --- a/sys/arch/armv7/Makefile +++ b/sys/arch/armv7/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/12/08 14:46:39 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2016/05/23 02:19:46 jsg Exp $ S= ${.CURDIR}/../.. KFILE= GENERIC @@ -11,7 +11,7 @@ TAGS= ${.CURDIR}/tags NOPROG= NOMAN= NOOBJ= -SUBDIR= +SUBDIR= stand # config the fattest kernel we can find into a temporary dir # to create a Makefile. Then use make to pull some variables diff --git a/sys/arch/armv7/stand/Makefile b/sys/arch/armv7/stand/Makefile new file mode 100644 index 00000000000..45b7c8dc9ef --- /dev/null +++ b/sys/arch/armv7/stand/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 2016/05/23 02:19:46 jsg Exp $ + +SUBDIR= efiboot + +.include <bsd.subdir.mk> diff --git a/sys/arch/armv7/stand/efiboot/Makefile b/sys/arch/armv7/stand/efiboot/Makefile index 5d44b462afa..efb9b48073e 100644 --- a/sys/arch/armv7/stand/efiboot/Makefile +++ b/sys/arch/armv7/stand/efiboot/Makefile @@ -1,7 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2016/05/23 00:45:48 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2016/05/23 02:19:46 jsg Exp $ -PROG= BOOTARM.EFI NOMAN= # + +.if ${MACHINE} == "armv7" + +PROG= BOOTARM.EFI OBJFMT= binary INSTALL_STRIP= BINDIR= /usr/mdec @@ -68,3 +71,8 @@ ${PROG.elf}: ${OBJS} .NOPATH: machine arm CLEANFILES+= machine arm .endif + +.else +NOPROG=yes +.include <bsd.prog.mk> +.endif |