From owner-dev-commits-src-branches@freebsd.org Thu Jul 22 17:07:23 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E24E8661862; Thu, 22 Jul 2021 17:07:23 +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 4GVzQg66GZz4TCd; Thu, 22 Jul 2021 17:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B9E7115B1D; Thu, 22 Jul 2021 17:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16MH7NFG078155; Thu, 22 Jul 2021 17:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MH7Ncq078154; Thu, 22 Jul 2021 17:07:23 GMT (envelope-from git) Date: Thu, 22 Jul 2021 17:07:23 GMT Message-Id: <202107221707.16MH7Ncq078154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4292390bd62f - stable/13 - modules: Only build sdhci_fdt for arm and arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4292390bd62fe8286ed92b09ab7c1ae04323c36b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 17:07:24 -0000 The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4292390bd62fe8286ed92b09ab7c1ae04323c36b commit 4292390bd62fe8286ed92b09ab7c1ae04323c36b Author: Emmanuel Vadot AuthorDate: 2021-05-13 18:23:59 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-22 16:51:33 +0000 modules: Only build sdhci_fdt for arm and arm64 Other FDT platform (like powerpc64* or riscv64) don't have gpio built by default so just compile the module for those two arches. Fixes: 9e08f82058cb ("modules: Add sdhci_fdt module") (cherry picked from commit 0b426a1c2cef14ded10ded6ec737d5c116182996) --- sys/modules/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 911aebe88269..f01354e5e315 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -493,7 +493,6 @@ SUBDIR+= iscsi_initiator .if !empty(OPT_FDT) SUBDIR+= fdt -_sdhci_fdt= sdhci_fdt .endif # Linuxulator @@ -620,6 +619,10 @@ _em= em _rockchip= rockchip .endif +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" +_sdhci_fdt= sdhci_fdt +.endif + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp _an= an