From nobody Tue Apr 5 19:55:59 2022 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 252151A93198; Tue, 5 Apr 2022 19:56:01 +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 4KXz0c09D5z4XVR; Tue, 5 Apr 2022 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649188560; 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=PIJqryZ/Ds+K/KRS14NFF3ah09Z45ASJ2fRusiDXReE=; b=Y1XCaBzpiSFP2r7LNYiGRlDa9Se8foRvsAXtelJzKgRLar9JUdTBYBGNyOWkYqc6q0sXlY jPC2TlhgJXpOpXKyycc+IsUkVx5qxDgli8aDVtXHbUgOVlYzmSesaRdF78j4eLluLvwLTK 4JoGXRtMbSt1yKjSgEV/tg910M08kpBRFJ4VjwcbB4N8+ZnxV01bFutd9BB4rgBlBC4z9Q 11Tip+XpCwSOmkYQayopZW964kaYaE2si24sx6jOGVN7kAEaRKGmzk6FTxz6iYdFyjylQQ zFaYPtDLlDPScGEn5azn817bNt1pz1nByu98SBTSWuJeJw2mblC+InapAmL2vg== 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 438F64DD1; Tue, 5 Apr 2022 19:55: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 235Jtxuf052455; Tue, 5 Apr 2022 19:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235JtxdD052454; Tue, 5 Apr 2022 19:55:59 GMT (envelope-from git) Date: Tue, 5 Apr 2022 19:55:59 GMT Message-Id: <202204051955.235JtxdD052454@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: ff8d9d9c5618 - main - config.mk: Add opt_platform.h support 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: ff8d9d9c56185d38f507ffe2659cfd13633b9a12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649188560; 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=PIJqryZ/Ds+K/KRS14NFF3ah09Z45ASJ2fRusiDXReE=; b=evI9Io/qebyVidBLarvb3glZfpaLGyIGD9xXSvOZFwYMFHrr//NGLJKyJevDzoBdXffYri +irMzCtNoC9Kbl9g8ij1pBbuSrH5OSBHwHiKYTGwi/vvMbFs0v/xPuodD5YlBnBB44algz ACEgX1QVZa9DszdrYcx2XJBGNEaODB1u/hsMXcKjx+PApDrQlZShkMYVC11bQxhaownPzy iAUEhubT7zjwJIAaxGO2OQ7WB6vyYOTsTn4qF64aZjgfp6v6Jfnkg5O1s85r4gVYvQVNoA KxaoMhVDdZElWZrCwQ6JWPLGtQcJmbphIhgvXf0jcyZt7d/+y691QCIr7HGY4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649188560; a=rsa-sha256; cv=none; b=cACFbAZAoSsgl26YD2lDKRxydvKobrDPN7hnSvESFNZUnIMu4fcEw6vZtAZLTMqr6Gvx6Z X1sZ6JpTuU5Nuf90PAQynIRq2D81ZWsrkZgBP9uEFepFCku0aQcR6Lu1SdxfQPtjPXGn7L HCJSZT3sveKkRKgG9XJ25Ud/AlVBX+Za/kp5I6mOtMHu+CUDkrxegAfZyv957F2XdEdSqO Qfm8AMCUUFTOhmwGXL53QLurwrS/rU0t/2oDrktd/D9bmqNNzwCJ75l7XIepyJ3HRpp7YM EJdIYIvhvxNgKRGUfSSfYjxaUUS4ZOM4WF5ar+xLI0ww22qFDLyyXRy4QBDMJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ff8d9d9c56185d38f507ffe2659cfd13633b9a12 commit ff8d9d9c56185d38f507ffe2659cfd13633b9a12 Author: Warner Losh AuthorDate: 2022-04-05 19:39:09 +0000 Commit: Warner Losh CommitDate: 2022-04-05 19:52:55 +0000 config.mk: Add opt_platform.h support opt_platform.h is now included from miivar.h, so add support for generating it in the standalone build case. Sponsored by: Netflix --- sys/conf/config.mk | 6 +++++- sys/conf/kern.opts.mk | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 96b03da27980..90e8934d1908 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -37,7 +37,11 @@ opt_ratelimit.h: @echo "#define RATELIMIT 1" > ${.TARGET} .endif opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} + @echo "#define MROUTING 1" > ${.TARGET} +.if ${MK_FDT} != "no" +opt_platform.h: + @echo "#define FDT 1" > ${.TARGET} +.endif opt_printf.h: echo "#define PRINTF_BUFR_SIZE 128" > ${.TARGET} opt_scsi.h: diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 532c282edc34..077009baebf0 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -102,6 +102,12 @@ BROKEN_OPTIONS+= KERNEL_RETPOLINE BROKEN_OPTIONS+=EFI .endif +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +__DEFAULT_NO_OPTIONS += FDT +.else +__DEFAULT_YES_OPTIONS += FDT +.endif + # expanded inline from bsd.mkopt.mk to avoid share/mk dependency # Those that default to yes @@ -178,4 +184,9 @@ MK_${var}_SUPPORT:= yes .if !defined(OPT_FDT) && defined(KERNBUILDDIR) OPT_FDT!= sed -n '/FDT/p' ${KERNBUILDDIR}/opt_platform.h .export OPT_FDT +.if empty(OPT_FDT) +MK_FDT:=no +.else +MK_FDT:=yes +.endif .endif