From nobody Thu Oct 06 13:35:42 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 4Mjsrt3C7Tz4dct7; Thu, 6 Oct 2022 13:35:42 +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 4Mjsrt2hhpz3Dx9; Thu, 6 Oct 2022 13:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665063342; 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=aN06LhooC8YGD2pnVB0YkWhJPCVgtyLj7smZjG21wrQ=; b=hLKHQC8seR59Rr2jeZ6fGBPhde5fiilL4yAslcs+hNyT/NiB+thmUlNAWl2NlNPvBVMRlx Niow+b+3ExMGvhoNW7BrZ4qUMoEYfttddokc+Ry3U/Vdm8ltWSj7ZI7N4G77KzbADSFOx+ D9qe0wsLYMfbomViPFRN/7C41K82koN6UsKfGeZMGuv0xAdvvY3X2ATTQRYEX3wXlaQs7P Gz2aPutRRVZab7pEcHnXKQVW+TYvCXvJ0l3culGtRXmcSH29qkvPhyXzniVHsCuPHiC3PW BGIPxSEFVga4srLXkmQLaVLTEYZ43zcUX2Fnwi54zB8pFKh/vRAFD8bE+W9Mdg== 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 4Mjsrt1V6qzGNg; Thu, 6 Oct 2022 13:35:42 +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 296DZgo0018619; Thu, 6 Oct 2022 13:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296DZgGI018618; Thu, 6 Oct 2022 13:35:42 GMT (envelope-from git) Date: Thu, 6 Oct 2022 13:35:42 GMT Message-Id: <202210061335.296DZgGI018618@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: e590c9eff81c - main - Fix the options to build rk_usb2phy.c 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: e590c9eff81caf43592c075215cf8c9b3dc826c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665063342; 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=aN06LhooC8YGD2pnVB0YkWhJPCVgtyLj7smZjG21wrQ=; b=OaOs+Ts2GVXMLQ9KFoNk425M/WFH/vk6E1yBq/ptXNRYJ7WqR0VLzcIA6tLmFJowciC3e4 zLhBCfC36x+v5ksnf8l1pImNSgNZT9DFKTaFABexH9hoGZcxDdWlUvAh+9zdTYJIlWjqf8 lmtmkq60reUg2xg/I6CJ8Bo1/hIASYvigj9tAOSPLZr8sLtjzdvJZNuf6/XGWhxdCruZl9 DdplwPxKmuFJWczr+SQt3FT93NGZKfMq5rl6Zn08FFifSd9xzKWMSz3VF9JiBMjBKHKcqP /nCpP8TmmQgzadxoV3bGUqD5TKmr6NkPK8afD5HcsqvJWFmcqovVDiIj7YfKFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665063342; a=rsa-sha256; cv=none; b=UW9ZzGBx+ZsJVviau6SXWti+7BVUetsR+yPGss4rlNUtsKtDWR5Y0iBryKIfxk1xOoSMXI UUmLnltA1OX9DFGfucXcSZ3H+wpCNfbhCDtmWO+tAOQHBr7JXATAP7ENbYyvHUQ750K36R N3NzM2AOtfFDFyg0Wg0SlA7ZUug8Fd2c/y7ioZaZrrxvOBI/UnOzfDXVLtmZiwFmVWM+x7 g24wrohhbO7qbCLF+Taa1VgmtV6F/X70PStlFMAn9GAURvF5B74zzL+bSQsGAGpGfPMpD0 k7f3cpX3G1jAS1k8YobezgyGSzPztGsrk33xUyLYBeKlhf874kX7qzbI45gacw== 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=e590c9eff81caf43592c075215cf8c9b3dc826c5 commit e590c9eff81caf43592c075215cf8c9b3dc826c5 Author: Andrew Turner AuthorDate: 2022-10-05 10:45:45 +0000 Commit: Andrew Turner CommitDate: 2022-10-06 13:30:18 +0000 Fix the options to build rk_usb2phy.c We need to check for fdt rk_usb2phy on both sides of the '|'. Sponsored by: The FreeBSD Foundation --- sys/conf/files.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 3a92f05bea63..f793bf9863af 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -582,7 +582,7 @@ arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip_rk3328 | fdt arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399 arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain arm64/rockchip/rk_spi.c optional fdt rk_spi -arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | soc_rockchip_rk3399 +arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 arm64/rockchip/rk_typec_phy.c optional fdt rk_typec_phy soc_rockchip_rk3399 arm64/rockchip/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 arm64/rockchip/rk_tsadc_if.m optional fdt soc_rockchip_rk3399