git: efbfa74caf8d - main - rpi: Simplify dtb file tests

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sat, 12 Aug 2023 04:55:37 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=efbfa74caf8ddde7013bc0a82782eb40aaefa6e3

commit efbfa74caf8ddde7013bc0a82782eb40aaefa6e3
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-05 16:33:17 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-12 04:55:10 +0000

    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 482f8d5f30a6..cdc6c86777d3 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