From efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 5 Jul 2022 10:33:17 -0600
Subject: [PATCH] rpi: Simplify dtb file tests

Now that we no longer support armv[45] devices, these tests can be
simplified. While here, update the comment to reflect which rpi devices
we support. It's been way more thant he Pi-B for a long time.

Sponsored by:		Netflix
---
 sys/modules/dtb/rpi/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/modules/dtb/rpi/Makefile b/sys/modules/dtb/rpi/Makefile
index 482f8d5f30a..cdc6c86777d 100644
--- a/sys/modules/dtb/rpi/Makefile
+++ b/sys/modules/dtb/rpi/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
-# DTS files for the Raspberry Pi-B
-.if ${MACHINE_ARCH:Marmv[67]*} != ""
+# DTS files for the 32-bit and 64-bit arm-based Raspberry Pi family of devices
+.if ${MACHINE_CPUARCH} == "arm"
 DTSO=	\
 	spigen-rpi-b.dtso \
 	spigen-rpi2.dtso
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif ${MACHINE_CPUARCH} == "aarch64"
 DTSO=	\
 	spigen-rpi3.dtso \
 	spigen-rpi4.dtso