From nobody Mon Jan 23 12:37:35 2023 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 4P0qPW3G5Kz3bSv4; Mon, 23 Jan 2023 12:37:35 +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 4P0qPW2QGlz3C5X; Mon, 23 Jan 2023 12:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477455; 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=Fn7/vjCkrKJ/bD6Dx6fcipJMr0AwTK4G84z0Gn1DtQk=; b=CFbd6Jq4XTWr4+OBuH+WonFL7YQOP7S7xy3FinZQc8/0DwS/W0UsH6Ig3OYgS+1dJEi2pr N4voJUrEKxNgCeQJHVcfwvarZy2r8gc1A3a9y/xqo+g0OGppj61/lsMyFEtBu3RYdehTlS k4bbBSmEa1nSgOtOqc9IqvROhNexwpTF0cWBTuNSw6nBLdCf4PnCZMLnxwCF9yiUMtd59q 9d0j+r5l7omJxgGhakDlN2AvK1Qvr/2eLYGCu3HveRet7onJXeIxBuvpHZp1SOWtgxVTq3 6rH2zlfaJUmPRoHLrlW3PnsTdmAe53J9NzPepm7MKRFgx1rauuJsr5aB0SFZ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477455; 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=Fn7/vjCkrKJ/bD6Dx6fcipJMr0AwTK4G84z0Gn1DtQk=; b=IkBi2+be7NTr81Kzg6AmDW51sk73YZiN1kF9+bchsT6qpmAH4R4UdHKmOFqgwgqz1E8/A8 vBpCLN50XKn5yPJJ9JMRBSSnrQr2Ac524sXXkh32KSi+vcrzR4z6qiSluLGE1CHWhXhT6w tnwx9Ts9PLCWe7lg9pmGkVr9RjdIYfvoKwk3e3x3yTRQcToigoCGW0GY/hqFZG+stBwzjy hglng2EO/ijQ97JjtBylhE9V6n78ww2NtDjH5/SKZYLnDmb8GnJoD0i+gjQN1k7vzcAq1o PpilDDeKeXodKtR3EAPpe2rlDCN9P7y81VHwMLICxly3dJSzJ71QJcJDXhd+oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477455; a=rsa-sha256; cv=none; b=MJ8NFc4ki3/BPHuYRgNNeoDyiBDB73nbKoBy4URvpkfkfYbukYpDGRDkw5xIYcDpAb0t+v 7lSSc6bdy/SgMDwAZmR3oKmX24G3DHqp8Z/eCi0vwmWF3sck7jJyHwR9d65QKte1ipeu2s OZFamhMozDIkB1fN1By8nrp8jlRxXLvCB0kgdbOBqTAbPuS1w5nJ4Be535MII3P1gale4I ZTvVi85ZKbCwocgjiUWbMNRFsahJUQT9C0SEZv6u7Omjd98zSufia6AY3/hTYYTz2u2Int hAaWRek/Hh6mkkav42Na+I2dCYJi4tDsSQCuF4qVZpP5HzfOxZg1/bVRZovvSw== 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 4P0qPW1TwVzVDX; Mon, 23 Jan 2023 12:37:35 +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 30NCbZHk085286; Mon, 23 Jan 2023 12:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbZuV085285; Mon, 23 Jan 2023 12:37:35 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:35 GMT Message-Id: <202301231237.30NCbZuV085285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1289b327b607 - stable/13 - Sort the SOC options in the arm64 NOTES config 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1289b327b6072dbbb5f1e0193e69067d70173a67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1289b327b6072dbbb5f1e0193e69067d70173a67 commit 1289b327b6072dbbb5f1e0193e69067d70173a67 Author: Andrew Turner AuthorDate: 2022-11-02 19:42:32 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:27 +0000 Sort the SOC options in the arm64 NOTES config (cherry picked from commit 2222b0e7133ebaa4588f98fa2213c30e45f6d283) --- sys/arm64/conf/NOTES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 8036784370c5..0d275c0fdd2c 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -34,10 +34,10 @@ options INTRNG # SoC support options SOC_ALLWINNER_A64 options SOC_ALLWINNER_H5 -options SOC_CAVM_THUNDERX -options SOC_HISI_HI6220 options SOC_BRCM_BCM2837 options SOC_BRCM_BCM2838 +options SOC_CAVM_THUNDERX +options SOC_HISI_HI6220 options SOC_MARVELL_8K options SOC_ROCKCHIP_RK3328 options SOC_ROCKCHIP_RK3399