From nobody Wed Mar 01 18:32:59 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 4PRjXW4w8Vz3vC2g; Wed, 1 Mar 2023 18:32:59 +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 4PRjXW47WNz46dd; Wed, 1 Mar 2023 18:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695579; 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=dpdKe+1C5DaBa83cWzs3kJBXyyJELGprQldtCNV/iMY=; b=Lzh/cCR8NrPizHAJAUlVFJoo2M+/dsEfNoDvItbUuAO++Sl5qEgBdQ5StywZR7AOJ5zEa2 tL6h1TuAcOvY0I6xycaJMyIffgwcqqo96SWAQENqXBcmAzhAcJEoHt8ezKN39dC+ATUsPY fMfq8VdrVqXi/WoQ42sC5GE63fyXjjhE1o3bkltuJGjsniFKOuPiR0xDv1RFGDR54aNuUT iO6Oy3RGB8eMrWfTAKmDN1ubtGfb1MNe80rgcqzPIsrGedrlwKjcODLB3v8YqFYkFBG03+ s4cZuPNxd7XLL2pVHTvm1Z0uNBd+OenqzWwmGDz4wmeJ1jkVwA7Jv5nHJWAWSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695579; 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=dpdKe+1C5DaBa83cWzs3kJBXyyJELGprQldtCNV/iMY=; b=bxeDcPOR/mvD942N1ye2XtaG5ZZRfomlqoD7c3eSxKy6ZiUxIQuLEdAcSO94SA5No9vVo+ Se9YqtTDTTslCBM6I9EAIpnAOudc8q46n561gqnRzmuTKkt6jvb9zq72IO0vwC91cpGTuv /Gfk0OcMclNVLiyck9VMBbtPtb6p8hWiH3q+A10yF9qTMKNrQ/SwfcpGsr0WzBkqeIWjgB PcrDLJBpUVIc1VHAF6bFIeBQrCKfvMK7jZjhYPhVQfu53GntRSsK+pI5xH3Q4v0ZjOCVQl /+1a3HQdAd6RAK6B3i46JZVKy/e21vxGph8hhnMmdodAHJMroi8ZRBvD+4lKxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695579; a=rsa-sha256; cv=none; b=KZvXU98ySOjs0ClZIRvc6GcYERlaZdVsnw0RTikNABSdCmu14ljdEGkPRSrQXnXXGaG4IY LkFJwLDuJDLh/QkcDLhTIGJtSbCbdKJ/TCEJE05n3oXWdCDh/cHchMztb+sj1weV7hRJ03 0I2pJYTvRrIo+Gi7F+exJObxN4f4QWFuhqOdrYS7wrh/EoUtkz/FunuGL7qOHv/SmKPgFK K+w023BEMKRHH7IeWYApqYEPURTaMEswZuWKPCFdigChPoW670bu283wcQS0eXATBEI8GC i0z/EQs4KopQ/3uTMEENjIzIx3MdYexzWuM0hfb2qyg36b/IMZqBSWCF0Z0D9g== 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 4PRjXW34FFzl2h; Wed, 1 Mar 2023 18:32:59 +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 321IWxY0099804; Wed, 1 Mar 2023 18:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IWxB3099803; Wed, 1 Mar 2023 18:32:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:32:59 GMT Message-Id: <202303011832.321IWxB3099803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 57716e7361ae - main - sys/modules: fix bogus OPT_ACPI 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57716e7361aea3fa578a0a8f2b5a65154d4819d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57716e7361aea3fa578a0a8f2b5a65154d4819d4 commit 57716e7361aea3fa578a0a8f2b5a65154d4819d4 Author: Nathaniel Wesley Filardo AuthorDate: 2023-03-01 18:32:08 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:32:08 +0000 sys/modules: fix bogus OPT_ACPI tests ACPI is not handled specially by sys/conf/kern.opts.mk (unlike a few options), so we should fall back on the generic behavior of sys/conf/config.mk, which pulls from all the generated opt*.h files, including opt_acpi.h, which will cause DEV_ACPI to be included in KERN_OPTS. Then the generic machinery in sys/conf/kmod.mk will cause SRCS.DEV_ACPI to be included in SRCS when appropriate. Reviewed by: jhb, imp Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D38737 --- sys/modules/dpaa2/Makefile | 4 +--- sys/modules/hwpmc/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile index eeb9e7f340bf..72e8e46143c8 100644 --- a/sys/modules/dpaa2/Makefile +++ b/sys/modules/dpaa2/Makefile @@ -21,12 +21,10 @@ SRCS+= bus_if.h device_if.h miibus_if.h SRCS+= pcib_if.h pci_if.h SRCS+= opt_acpi.h opt_platform.h -.if !empty(OPT_ACPI) -SRCS+= dpaa2_mc_acpi.c \ +SRCS.DEV_ACPI= dpaa2_mc_acpi.c \ memac_mdio_acpi.c \ acpi_if.h \ acpi_bus_if.h -.endif .if !empty(OPT_FDT) SRCS+= dpaa2_mc_fdt.c \ diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index a72b3cf8d2fd..5e509c5499f3 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -12,10 +12,8 @@ SRCS+= vnode_if.h .if ${MACHINE_CPUARCH} == "aarch64" SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c -.if !empty(OPT_ACPI) -SRCS+= cmn600.c hwpmc_cmn600.c -SRCS+= hwpmc_dmc620.c pmu_dmc620.c -.endif +SRCS.DEV_ACPI= cmn600.c hwpmc_cmn600.c +SRCS.DEV_ACPI+= hwpmc_dmc620.c pmu_dmc620.c .endif .if ${MACHINE_CPUARCH} == "amd64"