From nobody Mon Feb 21 16:29:58 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 0D7D719DE7A6; Mon, 21 Feb 2022 16:30: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 4K2SSl0hYBz4gkX; Mon, 21 Feb 2022 16:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461000; 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=TwXWxTzLrMVolj3ffMI35E7u0q4yY13QYwQMWKrX8AA=; b=oIWaNgmSHcHe05x38E3c9pzc1duMiH4qJhM8IMoRvz79F9QFHUfGr7UZVWcOdXJWlfV3Gg RCTxxqpDHbSkKLPlVkOjiVnmnUXsF17lwSWSBjuhS3Da9e9wbw0r2phA8aGOeZaAVm/r1i bCq9+Y0sddvHct4XRXVzYK//O8IDQ5P/mMNWxbcGbRlCNU8db09Q5MZfPQj52PrB2tk/0Y WGFF9463+DWHCPXR5jeoq7RigtPiXOc3HT0f3fGdxiiLoy3HaOukE/hE0q8PTBQTuFJVja /sPwrescUmj3urt54Q8V0GJUmpGdx6BkJ8HKPrMdJzu9DmT+LtjfI8jmtnKBIw== 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 8C85B13831; Mon, 21 Feb 2022 16:29:58 +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 21LGTwGL008610; Mon, 21 Feb 2022 16:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTwi1008609; Mon, 21 Feb 2022 16:29:58 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:58 GMT Message-Id: <202202211629.21LGTwi1008609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ee2e56c6d7f6 - main - armv7: allwinner: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee2e56c6d7f604e7aab8a8414753951a5809a985 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461000; 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=TwXWxTzLrMVolj3ffMI35E7u0q4yY13QYwQMWKrX8AA=; b=mYL4EUAo1OM3Y6NF27SE0IhFd1Z7vb+yRaFfYwtwSx6lJD1DKFuZxWm41WO7QWGKgHYO7L ef1jrI+1YsdbatEXuzq94OtxcM/LHkCNImomGiEbigyMYDI06Ynk4m8rzdYYk5H3Me6sWr HLPbeWT6Jw0ZQNpBWCPGsmV7lthPDwmsEFta+1cgYnffvjRdlGCSCClHg0ivWieyCM4u4b +ZKnJ8cvob3dlnsOgytazkjbImPq/SoBGBuaIB62VAlPovcryteoaDbtNSrVqE/U5ABbK9 qhOJE5cbKdbZyWemkrEFUZt0FLPIIxYEN5q1SgOfwPeszE+ampk4zMFiQkn45A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645461000; a=rsa-sha256; cv=none; b=W/55A+65C5zkcfOtXKTVM2pneMarBQyxJnZJFCG7pWX1IYMXGtRHVcNwkHusyGTcAG+cPK oscgPg3U5XWaHpERC2kwm5WkDezZ5v2YmY1LgZDbRDZ3lOkFiFEZ/2gGLQJjqHtD1Cd0a+ oPmyGu7Xt4WPppqvhvgz0YrFuXoP2iChDTKJ9UAWeIbTuSNoOzuvgs+mkSRnqkAh/TzMli 1qqsgooi6DkgYz+t2mB1McyONIJhktkCZDCXWwqoBfYEyNP3wNuWqVG2TTc+f04B1hGXkH Jvu4QWmz1s3ONm2gy0wEiyjofH+qBJTr8BMt5nenCAhQ+IP6vyoOHHL8Rc8beA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ee2e56c6d7f604e7aab8a8414753951a5809a985 commit ee2e56c6d7f604e7aab8a8414753951a5809a985 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:51:52 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:29:04 +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 --- 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