From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 74E5FAC0DAF for ; Tue, 16 Jan 2024 11:54:39 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=1tGi8zpsvc3DuL5TaPgb63fnbBMsVzRNsTU423l9MDw=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:User-Agent:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1705406078; v=1; b=FUFS5/+qL2mkIZhxVacZSV81L+zz+HL67e5y8sWR1+rI9lQ5uxSXzNG+VocpanY4B73HtrJx xfn4AyV/Unam755ux/k/tJeGhnacs0AEHntWxifqCT07Qd28fxG19B0+1JS7ESK3KBfVAZ7T0zW DotIXms3GSix/oLQ/5VJKm1U= X-Received: by 127.0.0.2 with SMTP id 4DrWYY7687511xOVW3n9aSHA; Tue, 16 Jan 2024 03:54:38 -0800 X-Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by mx.groups.io with SMTP id smtpd.web10.11674.1705406076054751295 for ; Tue, 16 Jan 2024 03:54:36 -0800 X-Received: from loongson.cn (unknown [10.40.24.149]) by gateway (Coremail) with SMTP id _____8Cxrut3bqZlLrAAAA--.3114S3; Tue, 16 Jan 2024 19:54:31 +0800 (CST) X-Received: from [10.40.24.149] (unknown [10.40.24.149]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Cxbs1xbqZl3_oDAA--.18404S3; Tue, 16 Jan 2024 19:54:26 +0800 (CST) Message-ID: <7a1627f4-ed0c-46f7-ac6e-6ab1f16393dd@loongson.cn> Date: Tue, 16 Jan 2024 19:54:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [PATCH v7 25/37] ArmVirtPkg: Move PlatformBootManagerLib to OvmfPkg To: devel@edk2.groups.io, lersek@redhat.com Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Jiewen Yao References: <20240112082153.3284189-1-lichao@loongson.cn> <20240112082534.3299238-1-lichao@loongson.cn> <29414777-a154-bd1c-95c8-6c4f4e01bbcb@redhat.com> From: "Chao Li" In-Reply-To: <29414777-a154-bd1c-95c8-6c4f4e01bbcb@redhat.com> X-CM-TRANSID: AQAAf8Cxbs1xbqZl3_oDAA--.18404S3 X-CM-SenderInfo: xolfxt3r6o00pqjv00gofq/1tbiAQASCGWmPl8EEAAAst X-Coremail-Antispam: 1Uk129KBj93XoWxtFy8ZF1DJF43try5Jw43Arc_yoW3KF4fpr 1ktr4rAr4rGF1av34UGay0vF409as0gF15Jw1Ykr12kasYqF1j9r1UtryFy347ZF1avr4D Ar4qkw43uayDXagCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnRJUUUyKb4IE77IF4wAF F20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r 1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAF wI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_Cr1UM2AIxVAIcxkEcVAq 07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1lYx0E2Ix0cI8IcVAFwI0_Jw0_Wr ylYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCj r7xvwVCIw2I0I7xG6c02F41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr 1lx2IqxVAqx4xG67AKxVWUGVWUWwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE 14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7 IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E 87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73Uj IFyTuYvjxUzfOzDUUUU 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,lichao@loongson.cn List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: h6VnNSL8y3GmVk5BNTyj1sGvx7686176AA= Content-Type: multipart/alternative; boundary="------------M0jN53MkVWBW6c6vaPCD0LkM" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="FUFS5/+q"; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io --------------M0jN53MkVWBW6c6vaPCD0LkM Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Laszlo, Thanks, Chao On 2024/1/15 16:46, Laszlo Ersek wrote: > On 1/12/24 09:25, Chao Li wrote: >> Moved the PlatformBootManagerLib to OvmfPkg and renamed to >> PlatformBootManagerLibLight for easy use by other ARCH. >> >> Build-tested only (with "ArmVirtQemu.dsc"). >> >> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4584 >> >> Cc: Ard Biesheuvel >> Cc: Leif Lindholm >> Cc: Sami Mujawar >> Cc: Gerd Hoffmann >> Cc: Jiewen Yao >> Cc: Lazlo Ersek >> Signed-off-by: Chao Li >> --- >> ArmVirtPkg/ArmVirtPkg.ci.yaml | 1 - >> ArmVirtPkg/ArmVirtPkg.dec | 1 - >> ArmVirtPkg/ArmVirtQemu.dsc | 2 +- >> ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- >> .../Library/PlatformBootManagerLibLight}/PlatformBm.c | 0 >> .../Library/PlatformBootManagerLibLight}/PlatformBm.h | 0 >> .../PlatformBootManagerLibLight}/PlatformBootManagerLib.inf | 3 +-- >> .../Library/PlatformBootManagerLibLight}/QemuKernel.c | 0 >> 8 files changed, 3 insertions(+), 6 deletions(-) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBm.c (100%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBm.h (100%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBootManagerLib.inf (92%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/QemuKernel.c (100%) >> >> diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.ya= ml >> index 506b0e72f0..b186d4eb42 100644 >> --- a/ArmVirtPkg/ArmVirtPkg.ci.yaml >> +++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml >> @@ -24,7 +24,6 @@ >> ], >> ## Both file path and directory path are accepted. >> "IgnoreFiles": [ >> - "Library/PlatformBootManagerLib/PlatformBm.c" >> ] >> }, >> ## options defined .pytool/Plugin/CompilerPlugin > OK > >> diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec >> index 315db4e8ea..6aa5ea05f4 100644 >> --- a/ArmVirtPkg/ArmVirtPkg.dec >> +++ b/ArmVirtPkg/ArmVirtPkg.dec >> @@ -27,7 +27,6 @@ >> =20 >> [LibraryClasses] >> ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h >> - FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h >> =20 >> [Guids.common] >> gArmVirtTokenSpaceGuid =3D { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6= E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } } > This hunk belongs to patch "ArmVirtPkg: Move the FdtSerialPortAddressLib > to OvmfPkg". > >> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc >> index 147180f645..e48c75b5e9 100644 >> --- a/ArmVirtPkg/ArmVirtQemu.dsc >> +++ b/ArmVirtPkg/ArmVirtQemu.dsc >> @@ -70,7 +70,7 @@ >> =20 >> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.= inf >> BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf >> - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf >> + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pl= atformBootManagerLib.inf >> PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBm= PrintScLib.inf >> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo= mizedDisplayLib.inf >> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer= BltLib.inf > OK > >> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKe= rnel.dsc >> index c22a422353..668a65ba64 100644 >> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc >> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc >> @@ -69,7 +69,7 @@ >> =20 >> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.= inf >> BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf >> - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf >> + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pl= atformBootManagerLib.inf >> PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBm= PrintScLib.inf >> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo= mizedDisplayLib.inf >> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer= BltLib.inf > OK > >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/Ov= mfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c > OK > >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/Ov= mfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h > OK > >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManager= Lib.inf >> similarity index 92% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManage= rLib.inf >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManage= rLib.inf >> index 5bbd13aecb..f2fb69bd3c 100644 >> --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.i= nf >> +++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib= .inf >> @@ -20,7 +20,7 @@ >> # >> # The following information is for reference only and not required by = the build tools. >> # >> -# VALID_ARCHITECTURES =3D ARM AARCH64 >> +# VALID_ARCHITECTURES =3D ARM AARCH64 LOONGARCH64 >> # >> =20 >> [Sources] > OK > >> @@ -29,7 +29,6 @@ >> QemuKernel.c >> =20 >> [Packages] >> - ArmVirtPkg/ArmVirtPkg.dec >> MdeModulePkg/MdeModulePkg.dec >> MdePkg/MdePkg.dec >> OvmfPkg/OvmfPkg.dec > Hmmm. This makes me wonder. > > If we can remove the ArmVirtPkg package dependency from the lib instance > in *this patch*, then we should be able to remove it *earlier* too > (i.e., independently), while the lib instance still exists under ArmVirtP= kg. > > I don't see why the "ArmVirtPkg.dec" dep becomes superfluous *right here*= . > > If I look at this INF file, as of commit 4a443f73fd67, I see at least > two "ArmVirtPkg.dec" dependencies: > > [FixedPcd] > gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol > > [Pcd] > gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer > > In patch 24 ("ArmVirtPkg: Move two PCD variables into OvmfPkg"), you > move these PCDs to OvmfPkg. > > Ah, I understand now. In brief: this particular hunk belongs to patch 24 > (where you correctly modify "PlatformBootManagerLib.inf" anyway). The > point is that, with the movement of both PCDs from the ArmVirt token > space to the OVMF token space, "PlatformBootManagerLib.inf"'s dependency > on "ArmVirtPkg.dec" disappears. Therefore the above hunk belongs to > patch 24. > > ... When you implement that, please build-test both patches 24 and 25. > > More precisely, your patch set should build at every stage, considering > both ArmVirt and OVMF platforms. > > The command "git rebase --exec" is useful for building a series at every > stage. Do you means this change should belong in patch 24 is better? BTW, I did build and tested after applying patches 24 and 25(building=20 and testing with ArmVirtQemu.dec) and it works fine. > >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/Ov= mfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c > OK > > Laszlo > > > >=20 > -=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 (#113888): https://edk2.groups.io/g/devel/message/113888 Mute This Topic: https://groups.io/mt/103679477/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --------------M0jN53MkVWBW6c6vaPCD0LkM Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Hi Laszlo,


=
Thanks,
Chao
On 2024/1/15 16:46, Laszlo Ersek wrote:<= br> 
On 1/12/24 09:25, Chao Li wrot=
e:

Moved the PlatformBootManage=
rLib to OvmfPkg and renamed to
PlatformBootManagerLibLight for easy use by other ARCH.

Build-tested only (with "ArmVirtQemu.dsc").

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=
=3D4584

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Lazlo Ersek <lersek@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
---
 ArmVirtPkg/ArmVirtPkg.ci.yaml                                  | 1 -
 ArmVirtPkg/ArmVirtPkg.dec                                      | 1 -
 ArmVirtPkg/ArmVirtQemu.dsc                                     | 2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                               | 2 +-
 .../Library/PlatformBootManagerLibLight}/PlatformBm.c          | 0
 .../Library/PlatformBootManagerLibLight}/PlatformBm.h          | 0
 .../PlatformBootManagerLibLight}/PlatformBootManagerLib.inf    | 3 +--
 .../Library/PlatformBootManagerLibLight}/QemuKernel.c          | 0
 8 files changed, 3 insertions(+), 6 deletions(-)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBm.c (100%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBm.h (100%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBootManagerLib.inf (92%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/QemuKernel.c (100%)

diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yaml
index 506b0e72f0..b186d4eb42 100644
--- a/ArmVirtPkg/ArmVirtPkg.ci.yaml
+++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml
@@ -24,7 +24,6 @@
         ],
         ## Both file path and directory path are accepted.
         "IgnoreFiles": [
-            "Library/PlatformBootManagerLib/PlatformBm.c"
         ]
     },
     ## options defined .pytool/Plugin/CompilerPlugin

OK


diff --git a/ArmVirtPkg/ArmV=
irtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 315db4e8ea..6aa5ea05f4 100644
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -27,7 +27,6 @@
=20
 [LibraryClasses]
   ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h
-  FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h
=20
 [Guids.common]
   gArmVirtTokenSpaceGuid =3D { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0=
x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } }

This hunk belongs to patch "ArmVirtPkg: Move the FdtSerialPortAddressLib
to OvmfPkg".


diff --git a/ArmVirtPkg/ArmV=
irtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 147180f645..e48c75b5e9 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -70,7 +70,7 @@
=20
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-  PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor=
mBootManagerLib.inf
+  PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Platf=
ormBootManagerLib.inf
   PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin=
tScLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize=
dDisplayLib.inf
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL=
ib.inf

OK


diff --git a/ArmVirtPkg/ArmV=
irtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index c22a422353..668a65ba64 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -69,7 +69,7 @@
=20
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-  PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor=
mBootManagerLib.inf
+  PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Platf=
ormBootManagerLib.inf
   PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin=
tScLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize=
dDisplayLib.inf
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL=
ib.inf

OK


diff --git a/ArmVirtPkg/Libr=
ary/PlatformBootManagerLib/PlatformBm.c b/OvmfPkg/Library/PlatformBootManag=
erLibLight/PlatformBm.c
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c

OK


diff --git a/ArmVirtPkg/Libr=
ary/PlatformBootManagerLib/PlatformBm.h b/OvmfPkg/Library/PlatformBootManag=
erLibLight/PlatformBm.h
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h

OK


diff --git a/ArmVirtPkg/Libr=
ary/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/Pla=
tformBootManagerLibLight/PlatformBootManagerLib.inf
similarity index 92%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLi=
b.inf
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLi=
b.inf
index 5bbd13aecb..f2fb69bd3c 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.in=
f
@@ -20,7 +20,7 @@
 #
 # The following information is for reference only and not required by the =
build tools.
 #
-#  VALID_ARCHITECTURES           =3D ARM AARCH64
+#  VALID_ARCHITECTURES           =3D ARM AARCH64 LOONGARCH64
 #
=20
 [Sources]

OK


@@ -29,7 +29,6 @@
   QemuKernel.c
=20
 [Packages]
-  ArmVirtPkg/ArmVirtPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec

Hmmm. This makes me wonder.

If we can remove the ArmVirtPkg package dependency from the lib instance
in *this patch*, then we should be able to remove it *earlier* too
(i.e., independently), while the lib instance still exists under ArmVirtPkg=
.

I don't see why the "ArmVirtPkg.dec" dep becomes superfluous *right here*.

If I look at this INF file, as of commit 4a443f73fd67, I see at least
two "ArmVirtPkg.dec" dependencies:

[FixedPcd]
  gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol

[Pcd]
  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer

In patch 24 ("ArmVirtPkg: Move two PCD variables into OvmfPkg"), you
move these PCDs to OvmfPkg.

Ah, I understand now. In brief: this particular hunk belongs to patch 24
(where you correctly modify "PlatformBootManagerLib.inf" anyway). The
point is that, with the movement of both PCDs from the ArmVirt token
space to the OVMF token space, "PlatformBootManagerLib.inf"'s dependency
on "ArmVirtPkg.dec" disappears. Therefore the above hunk belongs to
patch 24.

... When you implement that, please build-test both patches 24 and 25.

More precisely, your patch set should build at every stage, considering
both ArmVirt and OVMF platforms.

The command "git rebase --exec" is useful for building a series at every
stage.

Do you means this change should belong in patch 24 is better?

BTW, I did build and tested after applying patches 24 and 25(building and testing with ArmVirtQemu.dec) and it works fine.



diff --git a/ArmVirtPkg/Libr=
ary/PlatformBootManagerLib/QemuKernel.c b/OvmfPkg/Library/PlatformBootManag=
erLibLight/QemuKernel.c
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c
rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c

OK

Laszlo
_._,_._,_
Groups.io Links:

=20 You receive all messages sent to this group. =20 =20

View/Reply Online (#113888) | =20 | Mute= This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [rebecca@openfw.io]

_._,_._,_
--------------M0jN53MkVWBW6c6vaPCD0LkM--