From nobody Sat Aug 12 04:55:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN7dj44KSz4TnPN; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN7dj3Qjkz3NK0; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIr7fOHQwUTShm7M5v/1p19o+YciwGgQkGiVgz+tmHg=; b=tYnjiGn7OHF0K1YRhbUrMF6mIfXqFYakpHfDlhHSimYldi9JnrqDJxO8qcM4CI7BnwY09n 9kwDJaB0jrOuWWMAOVLZKHkSHufTrF5UoDqKCJkIcpNep4cwFS7csGF6sikED1+5JdJUKI gW8ORB5GlciGYManlvv9FwJUnBuW8E8OkvreJ8B1nYT1ovf2drKIBSKlX4YVElreZ4xq8l la1/e6olJpDDJ1Q0mEJnqpVSB//sVYImY+mgWh1RjBAIEYysuXzJvFgIG62yHC3WuT5QM7 YStWnTXp5q67k2Br0CTZmHk99XQXEn8BgeuXQDvdShYuBpvIpwOkmkfTPoKqag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIr7fOHQwUTShm7M5v/1p19o+YciwGgQkGiVgz+tmHg=; b=jscNO0276pSehsqCZo3+LOO/MCvOzxIJBDnOCQvDGRIr38S5ou0SWeIAjlg07E3rr3tofB qYKcWcfj8P6fxe7/i6t980va9gkAywXn2g+zdz0o9v4eXkLAW7MhPFaKdcWSXQGTFvxBg0 JPaOPTKkCneXzZGz/ETu1MbzRyapkszuHNKToD10IJHM/TN8rwT4cvIANfUucJKQBwFIwI CfLS/ij+zjEBSNgQEa+cG6WaOjqNkjd0SYmz4KhCsQaWEvNO+59SDZj5TD3ATe+2QxzO0s VumaKYGvC636evQ39V+omHgwiz1Pz+cJ5RfeNrpDSwqE9CagV52ysh15nG7bBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816137; a=rsa-sha256; cv=none; b=IWdV1yS04K9xEJRXzIRt+Sv8f+gEmYJ3BT8rn2fvgfwUdkloRJ/GJfpGWKzVAr/XdgOZuM Qmt5+GsfS0xrtzx3YwqNveiOhsMfNvW60aoEYshqztTIddJymx9hVTY7bEypecoGY2SnLD YLJwmZWcvyIb/492yd69z5IIHe4jj9Ov+UsE9yNiKKYOnre6zB///JwziAHTMnIivcL7h5 4pPatSWPBBf4cTGRNpw3UtKuBnkRl9FFfWU5WyggYr4ZzA8tICgdx5wGsQZdXjB29D4Y7D +ZEJQeNk6+allgtlonp0Lyq7a5saS2/i0Sw+6uummXN+kEqL7UP2LJRjTDjwwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN7dj2Y0Zz16w1; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4tbQm074519; Sat, 12 Aug 2023 04:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4tbM3074516; Sat, 12 Aug 2023 04:55:37 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:37 GMT Message-Id: <202308120455.37C4tbM3074516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: efbfa74caf8d - main - rpi: Simplify dtb file tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 commit efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 Author: Warner Losh AuthorDate: 2022-07-05 16:33:17 +0000 Commit: Warner Losh 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