From nobody Fri Oct 28 17:32:50 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 4MzV4M2P1kz4gf5Y; Fri, 28 Oct 2022 17:32: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 4MzV4L5PShz43bm; Fri, 28 Oct 2022 17:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666978370; 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=iC+vAsKj84Oic6+MU7lULKywFB7FZsf3hGUy/+NvySc=; b=bpsUW96gW/5CjGhCmP2oftDUmj+Q673aVudoLng9jDU0uj9kTjk4VgsycCP8NbTOqVAA+d MqEY+EfmkLOK3oQPtajwMO46y3y8X7f6EDlFKojpLSrEoDP5T8hHFungX9ovsCZ2C6NvMi CPnpuuhPctkJpdg7TkfJBDen7eHqrlH1aXtaEuY35PuuF9ARJNQX699x/KBxfwxztb79XE UekavW1LRLL2dLB0Mt/0Z1VeLfexGOmNuIwMbvAnGVVfRMimXPUIpMpy6bGdj+Au1k7Xui sJgdokq2MbmmSx/Gsu4jewVb75OqDCHjpZXgkFvVPNxPHqR5yVGjO3LDf0MLdg== 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 4MzV4L4TP8zm8m; Fri, 28 Oct 2022 17:32:50 +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 29SHWoH6024993; Fri, 28 Oct 2022 17:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SHWo62024992; Fri, 28 Oct 2022 17:32:50 GMT (envelope-from git) Date: Fri, 28 Oct 2022 17:32:50 GMT Message-Id: <202210281732.29SHWo62024992@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: 8724dd26d49f - main - Allow clk_fixed.c to be built without FDT 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8724dd26d49fbfa9b9486d30cb34380514bb952d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666978370; 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=iC+vAsKj84Oic6+MU7lULKywFB7FZsf3hGUy/+NvySc=; b=cdlH9A/CriRKIbg74CSub/Vy4z7CpxTABIDwZyKiUns4ezk/DPKKjXkn80R8CRsy68fEAE xrYnufq3fttnPiAB9fkCZvqSXq2xrd0qmcfQ6J6iMFlIgDiJ/e+7m2r0zdeNidW6aWinl4 ySxv9apqo5QSCHMGzLmEnRC1s8reP13txO1MXoXY/rbDKuzWchPbfmKpOrAvl4FbH0ue1k eUBE0bKpzmdyffF+eDaXtdOvZnrDJ9WcLfQ17MHqnBJ9fdS/sOoHovbEmfqvpye+b2oJw6 Ke3FDwk+NdjXfAsfs3ktsqQgogPtb7PS+3zmpM88vnOm0OsDj5QLiGQRISpMwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666978370; a=rsa-sha256; cv=none; b=bVc/G4yB/0N8iE8yqOmL5kvqMUq8gA2WSyOWoUIGe4L9tW0V8vnt1t7UkYj/SjC74Ht0Lz xHY5+xoxi9mjbx6aiBsaLVvueotsTPEm5FAPyKu6s0yiLs1hBc09J1zFHbRyBMlhbph8tU Zrmf/fMEcXqbUu9tZteH2/vfJ+GFKAVodOQyQTq1lIo2A51bNRdUUCjVxKaEJRrgNm6jOb 2dOK+cd2adtZM7npWaWcoHnm5nEPVtX2GZICeleMlpdHWsa4JzUXv+qG6RkVcpVu9xDC9w qtPPgJL4xcYe7qWid848/8tGNEB5VDkv2qWNDcNFbkhlHzvzJWbgOwuoJcnVTw== 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=8724dd26d49fbfa9b9486d30cb34380514bb952d commit 8724dd26d49fbfa9b9486d30cb34380514bb952d Author: Andrew Turner AuthorDate: 2022-10-28 16:45:41 +0000 Commit: Andrew Turner CommitDate: 2022-10-28 17:31:55 +0000 Allow clk_fixed.c to be built without FDT Include opt_platform.h to get the FDT definition and only include FDT headers when FDT is defined. Sponsored by: Innovate UK --- sys/dev/extres/clk/clk_fixed.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/extres/clk/clk_fixed.c index a38d444c5a29..57d8bf367945 100644 --- a/sys/dev/extres/clk/clk_fixed.c +++ b/sys/dev/extres/clk/clk_fixed.c @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_platform.h" #include #include #include @@ -40,8 +41,11 @@ __FBSDID("$FreeBSD$"); #include +#ifdef FDT #include #include +#endif + #include #define CLK_TYPE_FIXED 1