summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2022-02-03 10:21:14 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2022-02-03 10:21:14 +0000
commitb725c6df4236c06dc30e0c5940c4dfe7b8922a36 (patch)
treeffcdbd929a91c487a83e64be4b5330ac14977bca
parent85ddb1238a672c67cbd2c4f526c3512b600ae6c8 (diff)
Rename armv7_installboot.c to efi_installboot.c.
The code is common to EFI platforms, not specific to armv7. Suggested by kettenis@
-rw-r--r--distrib/special/installboot/Makefile4
-rw-r--r--usr.sbin/installboot/Makefile4
-rw-r--r--usr.sbin/installboot/efi_installboot.c (renamed from usr.sbin/installboot/armv7_installboot.c)2
3 files changed, 5 insertions, 5 deletions
diff --git a/distrib/special/installboot/Makefile b/distrib/special/installboot/Makefile
index e3bb126ed8d..8b00e1c27f2 100644
--- a/distrib/special/installboot/Makefile
+++ b/distrib/special/installboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2020/07/20 14:55:43 deraadt Exp $
+# $OpenBSD: Makefile,v 1.15 2022/02/03 10:21:13 visa Exp $
.PATH: ${.CURDIR}/../../../usr.sbin/installboot
@@ -16,7 +16,7 @@ SRCS += i386_installboot.c
SRCS += i386_nlist.c
SRCS += i386_softraid.c
.elif ${MACHINE} == "armv7" || ${MACHINE} == "arm64"
-SRCS += armv7_installboot.c
+SRCS += efi_installboot.c
.elif ${MACHINE} == "hppa"
CFLAGS += -DBOOTSTRAP
SRCS += hppa_installboot.c
diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index 327f424f419..0d2d845d710 100644
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2021/06/27 04:52:01 jsg Exp $
+# $OpenBSD: Makefile,v 1.24 2022/02/03 10:21:13 visa Exp $
PROG= installboot
SRCS= installboot.c util.c
@@ -16,7 +16,7 @@ SRCS += i386_installboot.c
SRCS += i386_nlist.c
SRCS += i386_softraid.c
.elif ${MACHINE} == "armv7" || ${MACHINE} == "arm64" || ${MACHINE} == "riscv64"
-SRCS += armv7_installboot.c
+SRCS += efi_installboot.c
.elif ${MACHINE} == "hppa"
CFLAGS += -DBOOTSTRAP
SRCS += hppa_installboot.c
diff --git a/usr.sbin/installboot/armv7_installboot.c b/usr.sbin/installboot/efi_installboot.c
index 8251deb6388..967b1acfe7e 100644
--- a/usr.sbin/installboot/armv7_installboot.c
+++ b/usr.sbin/installboot/efi_installboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7_installboot.c,v 1.11 2021/07/20 14:51:56 kettenis Exp $ */
+/* $OpenBSD: efi_installboot.c,v 1.1 2022/02/03 10:21:13 visa Exp $ */
/* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
/*