From nobody Thu Oct 27 17:59:50 2022 X-Original-To: dev-commits-src-all@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 4Mytjz1Tt5z4gfNT; Thu, 27 Oct 2022 17:59:51 +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 4Mytjz11YMz42wy; Thu, 27 Oct 2022 17:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666893591; 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=56A3vmOqqTND2biiwqeWWR0Pgm5QsKTMKDIQuVryo5w=; b=YSBhV1P0fFsBxfdCYO9GA3OIpakAZeEU1vGbnQJbNjWdgjglGohP9obBqqX7TWfMBoYYzx bhtkQLcr7YZ6XD+mCVzCbNXg/uVZ67IrGVz168Bm3jLqHxpu93+mo03CH9SILFC8bEp57L pqfu6tE4B5TTBfE6i1JOOYbc9mm4p/D6saYt35kfBJkKZHibEUBNx4HZt/YlLTUjJmN2nn wyxhNvXBMhxiz4wYNEznHNeKIAWZgPx13x0jTw1HxBrtcwLboXLImkz+SLAQZFcwjaGO2s tritF9IQdugfrdnN7QefB1M5adHZUQHOVWRq4EW10XMgm49y3GmRAMZd7pzH4w== 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 4Mytjz04v8z16fJ; Thu, 27 Oct 2022 17:59:51 +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 29RHxoP5019331; Thu, 27 Oct 2022 17:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RHxoXe019330; Thu, 27 Oct 2022 17:59:50 GMT (envelope-from git) Date: Thu, 27 Oct 2022 17:59:50 GMT Message-Id: <202210271759.29RHxoXe019330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 701ab6dba4a2 - main - Stop building FDT-only modules in an ACPI only kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 701ab6dba4a2232751cd91f79bfc1d8e96bf5316 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666893591; 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=56A3vmOqqTND2biiwqeWWR0Pgm5QsKTMKDIQuVryo5w=; b=Hov/lGsf5DaJ73lpI0x/rxci+2dwqgi7HDRhB1qDKUQW7bwKO21ISG6kDASOtF2Q3fcV1T Bc3uNwIBHBA8RAJ3OQd72nELuyTMhUdPwYD0QsuOHZgsKit8aEmgzPA+aAWKi5oCXXsFDS oo6P7idaDAF1ehYUsAZrA7NJushQcFMbL1JjL/PMUEJ9N/Nrxus+ZUInZP+WUNliKUmoLy +W59tz9A/NEEccr04xBfIOEb8fLIU+u/n8e9ffQDIV9o5R+rYqpkiawSGAihBNZbSevxYM zRik7Xbkz5AbN5CHL7L/yDYLUOsB02XAP91XQi+G7MHfK9vBaq98GqW8ubrZPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666893591; a=rsa-sha256; cv=none; b=QO70MDfgEY2+s2ggMN+/uMYpCjDmNDk5CwOMN3nxhzsXycqH312aomwJmdt43koHXEg4wb zJQqZo2mf3eDwUDjKCeVcXnQP6DQ/l05qylHP78E06xYkifNVyqVsCpvxrme6R0BoQeZRJ W0VO+uEEyxc+kSbL93SMA8ldV9B1ZxCrIP4Eoa2SEmLSUC2gsfGLflw2sqPqmTCQ8klMxt nMezQXTQXWZi+NConppI3eFNqxWuYrYwnjtRiOsDJCM0aVNLlEtVfBKr2DKp+ZauoFPXSN vQE8WoK1aOiwJ45l0pyt82eP2fwRCJAL2qm1p3JrqR3x+95W70gNAqrek6MfHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=701ab6dba4a2232751cd91f79bfc1d8e96bf5316 commit 701ab6dba4a2232751cd91f79bfc1d8e96bf5316 Author: Andrew Turner AuthorDate: 2022-10-27 17:01:44 +0000 Commit: Andrew Turner CommitDate: 2022-10-27 17:59:33 +0000 Stop building FDT-only modules in an ACPI only kernel When building a kernel without FDT these modules don't build. As they depend on FDT and don't work with ACPI disable them. Reviewed by: imp, kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37178 --- sys/modules/Makefile | 11 +++++++++-- sys/modules/uart/Makefile | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 8737871e7a53..5d6f8a352a86 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -611,8 +611,10 @@ _irdma= irdma .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" +.if !empty(OPT_FDT) _if_cgem= if_cgem .endif +.endif # These rely on 64bit atomics .if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" @@ -638,18 +640,23 @@ _cxgb= cxgb .endif .if ${MACHINE_CPUARCH} == "aarch64" -_allwinner= allwinner _armv8crypto= armv8crypto _dpaa2= dpaa2 -_dwwdt= dwwdt _em= em + +.if !empty(OPT_FDT) +_allwinner= allwinner +_dwwdt= dwwdt _enetc= enetc _felix= felix _rockchip= rockchip .endif +.endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" +.if !empty(OPT_FDT) _sdhci_fdt= sdhci_fdt +.endif _e6000sw= e6000sw _neta= neta _hyperv= hyperv diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index ad946fb063d6..29d6e0897b56 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -24,8 +24,10 @@ uart_cpu_machine= ${_uart_cpu} .if ${MACHINE} == "arm64" uart_dev_mvebu=uart_dev_mvebu.c +.if !empty(OPT_FDT) uart_dev_mu=uart_dev_mu.c .endif +.endif KMOD= uart SRCS= ${uart_bus_acpi} uart_bus_isa.c \