From nobody Fri Feb 2 19:59:19 2024 X-Original-To: dev-commits-src-main@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 4TRRS73vj4z588hp; Fri, 2 Feb 2024 19:59:19 +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 4TRRS72SQ8z4t8J; Fri, 2 Feb 2024 19:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903959; 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=MjjfE6FB9IcpV2cVbWcshTHPLOKcPzRmsgEvXH3Jwg8=; b=aX+D8ch0kOuB3eay8FfO8ClSz0tgRMgxBdgyQe+DJy2JSp6pObgw2XQicqvRLgd5UFN2Aw vtInvxTFKcNlVWrsTtZVh2X/0uSL/d3f/AisxgWI1/+3vyKBx14+iKUMYeQOtM+IArYjNG g1k67STErJ1Jr8qTda37DeI4PtdIGVVAwdC69dSZMZJQPFn4XgRPxIxEe3K1xNGEZVzRzV VXd1HU3wY/ZwRU//I9Wajh6kqBfWrweSYB7SMFKaJKpwetaDUmOV3vl9ar0vt1gHUt3hDS KRHZhoP8jElu8hktWgwuIhPEviR08mrYYWvcJmf/MyMgMY6Mnj4M+FjwfpyQLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903959; 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=MjjfE6FB9IcpV2cVbWcshTHPLOKcPzRmsgEvXH3Jwg8=; b=BitfLuj334WZpsq/SmcnSHQE4Ns4spE2OHbSwoSfR017E/qmhEUfiI/k2spcymREo+doIs CeKYOZTd7F5ha8HilLUvUypXVCELnjFYhLcGpE6bJoFbJomICNPFjkAtCaSBKVHAvTKuKi fZBtRf0BdmZUEJQg9gGMX1uNtzljXFBOOXOJ+REkfY47+1nfS750VD4VgXq7iUpsAF5jWi NO7LbsE1ACdLz92YqBAacPmkRZ7/U0pAV7ll3uhw6tlqivMkViyWYvUmTDgf7LHiwNQkCC QTnHCn9Ra6/0ZuaD87ECoJIKUrQdl+Bs3RjGax5AtMIboBTf17cvX/CN9K2YiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706903959; a=rsa-sha256; cv=none; b=a4wk4OwP65IVh5SPVKRRBWlB6pg9mWJRVOA/40IsGcYsHu0Qdyh6s9wKBcbyL/UdabjevU 4l2k+J523YmDLjNH0IGNxuHYZh3jVW2MbxJu18DxQ9cWRzy94epT1gXODxyjaeQ6eIUH+z UQuhekothCs/88yb6viRX503I9dCIEJw5Wa1+Np5mtQeN/fXttUsPvl9mjQxOl1YT+IA3y 4V1CODrfqkbaVCPnncz+W08PQ9JcFrUsrjEWUKOkHKnNW+Oxf1cEkPQKjDpvFWur4yLjpU d02iZKram2ahnYbEYFkNMTqLo6vndA4tUKZAtyM1CSQOFKL9ADXk1+O/ye+bMA== 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 4TRRS71TzFzjvm; Fri, 2 Feb 2024 19:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412JxJGu038287; Fri, 2 Feb 2024 19:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JxJJj038284; Fri, 2 Feb 2024 19:59:19 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:59:19 GMT Message-Id: <202402021959.412JxJJj038284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ca8fcfcf5ed1 - main - amd64: switch GENERIC-MMCCAM to GENERIC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 commit ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 Author: Mina Galić AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:46:05 +0000 amd64: switch GENERIC-MMCCAM to GENERIC arm's and arm64's GENERIC-MMCCAM is based on GENERIC. amd64's is based on MINIMAL. For consistency, switch it to GENERIC. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/amd64/conf/GENERIC-MMCCAM | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 7cf1ebdf9458..26e19887c800 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -1,33 +1,23 @@ -# MMCCAM is the kernel config for doing MMC on CAM development -# and testing on bhyve +# +# GENERIC-MMCCAM +# +# Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack. +# #NO_UNIVERSE -include MINIMAL +include GENERIC ident GENERIC-MMCCAM -# Access GPT-formatted and labeled root volume -options GEOM_LABEL - -# UART -- for bhyve console -device uart - -# VirtIO support, needed for bhyve -device virtio # Generic VirtIO bus (required) -device virtio_pci # VirtIO PCI device -device vtnet # VirtIO Ethernet device -device virtio_blk # VirtIO Block device -device virtio_scsi # VirtIO SCSI device -device virtio_balloon # VirtIO Memory Balloon device - -# CAM-specific stuff -device pass -device scbus -device da - options MMCCAM # Add CAMDEBUG stuff options CAMDEBUG options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) + +# pass(4) device +device pass + +nodevice mmc +nodevice mmcsd