From nobody Tue Mar 07 18:41:36 2023 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 4PWPRj20l2z3wTjv; Tue, 7 Mar 2023 18:41: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 4PWPRj1W5Nz3LH9; Tue, 7 Mar 2023 18:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678214497; 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=93P+GlDUOJEUvWgQkekOgT1licbQIU48Tg7PdJ72Wec=; b=wRr5r8YWxo3GxZreHigMm5wi3UcGdgmPAvE76ezlbN4e78PGwadmRLS+GX0VoHtse5sG6D Hqa9F9yisWCOQnENksF7snj35TOAflthV99Cmd/Poe0b0PGkgghFoT0FhFxhMbp4GtgF6D 5UYR5/faJLo9bKeESYXfFJeDVqcT7LwFiVAncDrTViK61dwuPpsTgk7IdRJeHeP2R9tL2P iyqRFw4SvpHM61BUMDd64uSsTFadLfvp9nzwhuPp6/lX1P0ODC8Ruf6QG0qzdfxyffdpsP o2qznXj/PlES63Y2BYhqg62U2MTKRVOiFS0noGRYOcRAx8YUguMorlfTzdsPaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678214497; 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=93P+GlDUOJEUvWgQkekOgT1licbQIU48Tg7PdJ72Wec=; b=A/SBmDJXCpabFDuSeh1KsYUKYvuMQ4ZBnP4QMGGOosX3fYcfengr2EFPtlgzg/v/jEXpyb 5FXErNZMwnfqEGa3qX2sxVJq2pZSSLLrbV0/9/sxvYsYbPmQ1a5xnPQrWUPIgrT+bsOZmQ krnuAFesfij4wV3FRVP8B0U7nyDXpZLHbDbYHPc2t5ZdRIXVdQLylG/j/E1aPW2QpNfqnJ nhwcgpp04sYCyQE48yQ2LEj+zsAj6p1c4SPc2Y6TIff2gzeJ6MjEHEdQ6uKj6HeB5h571N uj6+GIAZqoLRHoBBtsg4IZvYTt2sMnazyQRTDIKpR2L/EVte8BDJy1zhfOAt1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678214497; a=rsa-sha256; cv=none; b=spn1DSGS+8aGm0SryWvEo+DtbpT8LUF21iPaXhu1dS6SEOZvG7wek8Zx7CGBjSv2xBt5tU PmnPpt42EoMRAGRNgKWoeA5QKahJvjdmUdAkrq3jYKM0TUb+YR7HTsAlstPMC69yDxOEi1 HqJQtmxrXnIn5eqtKqh9lAAPJr25Q9MxK28rq3MLbyIiK08EEVuEGeTivdqXFJqnFZXmJp LPANz3R4st3FJxKeQY0Ft84jnbH88uwVMTJqASka9ySdsgVNPBc/zcKmZlSTAofwSHBfTd QB7wBipJhecGgj1YVE5tt3CqObI10ZValwzEDtzEJ5wmmsR2qUbT+zbv9d4Kgg== 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 4PWPRj0bWNzv85; Tue, 7 Mar 2023 18:41:37 +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 327Ifa1k099760; Tue, 7 Mar 2023 18:41:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Ifado099759; Tue, 7 Mar 2023 18:41:36 GMT (envelope-from git) Date: Tue, 7 Mar 2023 18:41:36 GMT Message-Id: <202303071841.327Ifado099759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7661a2abe45c - main - src.opts.mk: sync FDT and OFED options with kern.opts.mk 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7661a2abe45cfa144f69898f8498c3cfd88cceb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7661a2abe45cfa144f69898f8498c3cfd88cceb8 commit 7661a2abe45cfa144f69898f8498c3cfd88cceb8 Author: Ed Maste AuthorDate: 2023-03-07 16:39:46 +0000 Commit: Ed Maste CommitDate: 2023-03-07 18:40:18 +0000 src.opts.mk: sync FDT and OFED options with kern.opts.mk Where options exist in both src.opts.mk and kern.opts.mk they should be kept in sync. It may be that the option should be flipped the other way (e.g., enabling OFED in the kernel on arm64); if so that will be done as a subsequent commit after further testing. PR: 269994 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38952 --- share/mk/src.opts.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 319cdbb0ebee..96b390921d4c 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -95,7 +95,6 @@ __DEFAULT_YES_OPTIONS = \ EFI \ ELFTOOLCHAIN_BOOTSTRAP \ EXAMPLES \ - FDT \ FILE \ FINGER \ FLOPPY \ @@ -283,6 +282,12 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS .include +.if ${__T} == "i386" || ${__T} == "amd64" +__DEFAULT_NO_OPTIONS += FDT +.else +__DEFAULT_YES_OPTIONS += FDT +.endif + .if ${__T:Marm*} == "" && ${__T:Mriscv64*} == "" __DEFAULT_YES_OPTIONS+=LLDB .else @@ -348,6 +353,12 @@ __DEFAULT_YES_OPTIONS+=OPENMP __DEFAULT_NO_OPTIONS+=OPENMP .endif +.if ${__T} != "i386" && ${__T} != "amd64" && \ + ${__T:Mpowerpc64*} == "" +BROKEN_OPTIONS+= OFED +.endif + + .if ${__T} == "powerpc" BROKEN_OPTIONS+= ZFS .endif