From nobody Mon Feb 9 20:34:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111100+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111100+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699660785; cv=none; d=zohomail.com; s=zohoarc; b=H7eDylHui3P/KEMAw4J7ZZNisJ94Zmv4vQZj1WntgF4opXE5EZKscxDPwYHWty7KrklDKr1DOgXP+BaMlCxv7f/coED/tsnqQSBxrS1G17F467vfj6cgSlzzh/KuwFcxRENG1NeCkpP8cK4KJHXWiSC7uUjI9N0FqSZwWH/vYpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699660785; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=7+cPh1U8fZXsGFXYbkHIOGQyHhzwEGLLd963DU2/CyM=; b=OU5PhuDfUNlzfV4F79eDL64yrrfwU4W5oUMP5QJz2HPSHE7mazzt7eDdtjOaShb16UI3BW7DLssWlMj9ZonBXZhTzAfzD+D6GliwRu72dq67i9mAgom+xcr3EvWvUkRtA3GqRvDb55ZGeRlh+HQWrrOnKmwFuaL2TvhVs13T/io= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111100+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699660785057820.9722292669674; Fri, 10 Nov 2023 15:59:45 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=7+cPh1U8fZXsGFXYbkHIOGQyHhzwEGLLd963DU2/CyM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699660784; v=1; b=Cp693dJlmAejl3Jlwp3sHNZyAc1H1O22kvHMuHhxyX3RbNCN4cGcUp2WuRD7aswBEOA3D/bk LgojQ/hSo9GbrCqO0NN0Okgc2/AdLjXDB7IRm/ARmvVIYwaNnH6fyOwVzj1dd2RLppbhwfzj7Cr xG4qnHbQWV9sH6/8HHiBKehs= X-Received: by 127.0.0.2 with SMTP id 5VBUYY1788612xe8bokpAFl7; Fri, 10 Nov 2023 15:59:44 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.42852.1699660783659963852 for ; Fri, 10 Nov 2023 15:59:43 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-197-GpCNHDGWMBealWgdc8yFFQ-1; Fri, 10 Nov 2023 18:59:39 -0500 X-MC-Unique: GpCNHDGWMBealWgdc8yFFQ-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57AAF3813F29; Fri, 10 Nov 2023 23:59:39 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id C994CC1596F; Fri, 10 Nov 2023 23:59:37 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Anatol Belski , Anthony Perard , Ard Biesheuvel , =?UTF-8?q?Corvin=20K=C3=B6hne?= , Gerd Hoffmann , Jianyong Wu , Jiewen Yao , Rebecca Cran Subject: [edk2-devel] [PATCH 29/37] OvmfPkg: remove Rule.Common.USER_DEFINED.CSM from all FDF files Date: Sat, 11 Nov 2023 00:58:12 +0100 Message-Id: <20231110235820.644381-30-lersek@redhat.com> In-Reply-To: <20231110235820.644381-1-lersek@redhat.com> References: <20231110235820.644381-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: oUl3SqPvMvjPcTi2c46w8FJsx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699660785655100002 Content-Type: text/plain; charset="utf-8" We no longer have INF RuleOverride=3DCSM OvmfPkg/Csm/Csm16/Csm16.inf lines in any of the OVMF platform FDF files; remove the CSM rules themselves. (Note that some of the more recent platforms had cargo-culted this rule from the original ones, without ever referencing the rule with RuleOverride=3DCSM. Remove those rules as well.) Cc: Anatol Belski Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Corvin K=C3=B6hne Cc: Gerd Hoffmann Cc: Jianyong Wu Cc: Jiewen Yao Cc: Rebecca Cran Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4588 Signed-off-by: Laszlo Ersek --- OvmfPkg/Bhyve/BhyveX64.fdf | 5 ----- OvmfPkg/CloudHv/CloudHvX64.fdf | 5 ----- OvmfPkg/IntelTdx/IntelTdxX64.fdf | 5 ----- OvmfPkg/Microvm/MicrovmX64.fdf | 5 ----- OvmfPkg/OvmfPkgIa32.fdf | 5 ----- OvmfPkg/OvmfPkgIa32X64.fdf | 5 ----- OvmfPkg/OvmfPkgX64.fdf | 5 ----- OvmfPkg/OvmfXen.fdf | 5 ----- 8 files changed, 40 deletions(-) diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index 9cd059de159f..497c6753ce9b 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -454,11 +454,6 @@ [Rule.Common.USER_DEFINED.ACPITABLE] RAW ASL |.aml } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index eac6557e6b74..eae3ada1913c 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -458,11 +458,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX6= 4.fdf index 69074cfb1e73..e844a0988d68 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -431,11 +431,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index a9b6618ca811..c877b3f088f9 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -416,11 +416,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index f7652bb7009c..44e3b4e140d0 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -484,11 +484,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 74049ec129d2..1fbfdd40c58a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -487,11 +487,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 48b97d90e820..2220d1769c91 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -521,11 +521,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 18f8c81b0ef7..5770b173168b 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -462,11 +462,6 @@ [Rule.Common.UEFI_APPLICATION.BINARY] VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } =20 -[Rule.Common.USER_DEFINED.CSM] - FILE FREEFORM =3D $(NAMED_GUID) { - RAW BIN |.bin - } - [Rule.Common.SEC.RESET_VECTOR] FILE RAW =3D $(NAMED_GUID) { RAW BIN Align =3D 16 |.bin -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111100): https://edk2.groups.io/g/devel/message/111100 Mute This Topic: https://groups.io/mt/102518671/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-