From nobody Mon May 16 12:59:13 2022 X-Original-To: dev-commits-src-branches@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 8A4E01AEA203; Mon, 16 May 2022 12:59:13 +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 4L1zpn3HMGz4plH; Mon, 16 May 2022 12:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652705953; 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=EGUnbApDV2TGA7Zo+2cjbdACvwTgBZ03nOqBQ5Gid1M=; b=yBZPW2KjDYVX+smjBsoqo9xzAJQCQT8MIcL0DMHF1HdCmcB9tkoLD6lVXPoPsv6dmJahA0 LaDnDkEP4f1VkjzTX+OmKwqxDHGM+drseyxxmQt5hjJwChp50rS6wTObMUXkdlTX/Ji3My OOZrcpvwU7cfyDv82YLUdYWufeSQIlLRQdUv/kk/17dVfNuY/yzcS1sXvT6E1e2vTCLvdH Y3hxPYUHG++gVLk2cc8+RwR5dRrMqv8yP9yF03YnKS73+iQ4R3cuNBSeyXzHiECIlutgMd bLT13O05Gh88mYai1GiCdmRUhs4C4Es1MmdzZtCUp6sgzFFEUd1l+g/f64WmFw== 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 4C8911FFDD; Mon, 16 May 2022 12:59:13 +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 24GCxD7b002485; Mon, 16 May 2022 12:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GCxD6Z002484; Mon, 16 May 2022 12:59:13 GMT (envelope-from git) Date: Mon, 16 May 2022 12:59:13 GMT Message-Id: <202205161259.24GCxD6Z002484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: f9fb9339c301 - stable/13 - armv7: allwinner: Make ext_resources non-optional List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f9fb9339c301b6b37ca4edf8143b3a271e121a98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652705953; 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=EGUnbApDV2TGA7Zo+2cjbdACvwTgBZ03nOqBQ5Gid1M=; b=ek/b2J7ZPzDnXLW7xGiAYC5ch9i8fQB0c1H3JzOI8LASPmABWwozBSUsnYZToZR3mSoGfS DhP9lG1vPgiN+y6sQy4blK1LOM8nqrLxTkmXGAXZ+JHILMzyJb6Bbj3QDkLJ+ihesT8yPV gW4BFd5Ot/3Y0un5IOoSjfcr8fz8dR8A7nhPvxJ7GlYUHX0LouBdD/xau9O4+T8laGseZr iGRb8evrzE2WVoAyBWVCl5T03fiMbLg5f0uWfYA5VE0ssbd/s3TrZLnLTEtGCD7zmeZqO4 bYSYZ6M5Gq4nhWTp/zqiz5zjiLhJRSTYwGl7ty+P2xWfNm5s48uzWcZ11Fz5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652705953; a=rsa-sha256; cv=none; b=Y8eYXayLBomFpDN07sGLl8bIbp99D4hTSc6+5LZ9xIa3Tu2vUk0N1mjhI1MtOoS1Y4Gya3 zn5MibxOVC/KYNsjjJYiPNIChoJ8nsoKQpeE0duEM0Vg0b0VdpM6kuZbBX1fTe/MTRU6gA PCZ0r8aZEYcWTV+AOWWgf5qC+vNtM6w86ZPqFH1IiWlJHZ6w8HNCwI0p3n2yQtj3TgXrYt dNbdT3NP19V2roAUFctJtXSKnaZr4ZTyQHJmsSCkvfyUNYxN8FwfxwnEnEKJ47FOVEJ62t OHRh0XVaYkJd0IFprmtbUAwKgGSBi9bl5Koz0Sl/RuzMiUW6KsowWj3X418rvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f9fb9339c301b6b37ca4edf8143b3a271e121a98 commit f9fb9339c301b6b37ca4edf8143b3a271e121a98 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:51:52 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 12:51:51 +0000 armv7: allwinner: Make ext_resources non-optional The only valid condition for if_awg and aw_syscon is syscon. EXT_RESOURCES is enabled in GENERIC since 12-CURRENT. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33833 (cherry picked from commit ee2e56c6d7f604e7aab8a8414753951a5809a985) --- sys/arm/allwinner/files.allwinner | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index 57e27a962ec0..40775ac3212b 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -14,13 +14,13 @@ arm/allwinner/aw_nmi.c standard arm/allwinner/aw_r_intc.c optional aw_r_intc arm/allwinner/aw_rsb.c optional rsb | p2wi arm/allwinner/aw_rtc.c optional aw_rtc -arm/allwinner/aw_syscon.c optional ext_resources syscon +arm/allwinner/aw_syscon.c optional syscon arm/allwinner/aw_ts.c optional aw_thermal arm/allwinner/aw_usbphy.c optional ehci | ohci arm/allwinner/aw_wdog.c optional aw_wdog arm/allwinner/axp209.c optional axp209 arm/allwinner/axp81x.c optional axp81x -arm/allwinner/if_awg.c optional awg ext_resources syscon +arm/allwinner/if_awg.c optional awg syscon arm/allwinner/if_emac.c optional emac arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac dev/iicbus/twsi/a10_twsi.c optional twsi