From owner-dev-commits-src-main@freebsd.org Thu Dec 24 21:32:49 2020 Return-Path: Delivered-To: dev-commits-src-main@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 0A0FB4D20C5; Thu, 24 Dec 2020 21:32:49 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D23Fr6Gxmz3LX2; Thu, 24 Dec 2020 21:32:48 +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 CA76F1747B; Thu, 24 Dec 2020 21:32:48 +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 0BOLWmV9036651; Thu, 24 Dec 2020 21:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BOLWmO4036650; Thu, 24 Dec 2020 21:32:48 GMT (envelope-from git) Date: Thu, 24 Dec 2020 21:32:48 GMT Message-Id: <202012242132.0BOLWmO4036650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3b5008b065a9 - Fix amd64 GENERIC-MMCCAM kernel build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b5008b065a913c675ec3e41f06ec22f571ad7ea Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 21:32:49 -0000 The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5008b065a913c675ec3e41f06ec22f571ad7ea commit 3b5008b065a913c675ec3e41f06ec22f571ad7ea Author: Kristof Provost AuthorDate: 2020-12-24 21:30:52 +0000 Commit: Kristof Provost CommitDate: 2020-12-24 21:30:52 +0000 Fix amd64 GENERIC-MMCCAM kernel build c4df8cbfde53c376d93f439eac3f45a7b4fc705e removed bvmconsole and bvmdebug, but missed the bvmconsole entry in GENERIC-MMCCAM. --- sys/amd64/conf/GENERIC-MMCCAM | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 19dc27b95e3d..8a5bc7175d68 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -12,9 +12,6 @@ options GEOM_LABEL # UART -- for bhyve console device uart -# kgdb stub -device bvmdebug - # VirtIO support, needed for bhyve device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device