From owner-dev-commits-src-all@freebsd.org Thu Jul 15 10:03:02 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 06457663604; Thu, 15 Jul 2021 10:03:02 +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 4GQVLF52j7z4WPr; Thu, 15 Jul 2021 10:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 95A4A278F8; Thu, 15 Jul 2021 10:03:01 +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 16FA31Sw039907; Thu, 15 Jul 2021 10:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FA31UG039906; Thu, 15 Jul 2021 10:03:01 GMT (envelope-from git) Date: Thu, 15 Jul 2021 10:03:01 GMT Message-Id: <202107151003.16FA31UG039906@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: ab9f9cfda5a7 - main - Add virtio comments to the arm64 GENERIC config 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: ab9f9cfda5a77ff511d56cf183f081cb72ada79d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 10:03:02 -0000 The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9f9cfda5a77ff511d56cf183f081cb72ada79d commit ab9f9cfda5a77ff511d56cf183f081cb72ada79d Author: Andrew Turner AuthorDate: 2021-07-14 20:08:29 +0000 Commit: Andrew Turner CommitDate: 2021-07-14 20:08:29 +0000 Add virtio comments to the arm64 GENERIC config Most of these are from the amd64 GENERIC config. Sponsored by: The FreeBSD Foundation --- sys/arm64/conf/GENERIC | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index f92a78f8e802..152257783a96 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -377,11 +377,11 @@ device rk_dwmmc device rk_emmcphy # VirtIO support -device virtio -device virtio_pci -device virtio_mmio -device virtio_blk -device vtnet +device virtio # Generic VirtIO bus (required) +device virtio_pci # VirtIO PCI device +device virtio_mmio # VirtIO Memory Mapped IO device +device virtio_blk # VirtIO Block device +device vtnet # VirtIO Ethernet device # Chip-specific errata options THUNDERX_PASS_1_1_ERRATA