From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web12.5675.1665655186955983275 for ; Thu, 13 Oct 2022 02:59:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=V2DxhmPE; spf=pass (domain: ventanamicro.com, ip: 209.85.216.46, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pj1-f46.google.com with SMTP id a5-20020a17090aa50500b002008eeb040eso5267437pjq.1 for ; Thu, 13 Oct 2022 02:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z5ET1mBvwIRdF0u05Gi5NaPWnD/nKaI4QttnFFdy8EE=; b=V2DxhmPERIOsOKmv5vfu6khdic4XpSIy7m+3Juf2EHFJTleUbBp4mPCKRTw4v466jJ yErK3zXOe7EcpFczjlzszp3X7xERu2wAVw8QMwG/FpRaOlQToqmucKEsMU2oZz1+CKS1 +Vl+PHdaxXEF+GNGRwj26jb4+pSrEqduor4xpKl+ANt6h90al9g97qXkntTyID4ccrE4 0fjsdFT1qk44kwkis2OIJeZR/lPt14w5IS5lpVT/vi5UkEj8SOrHFlz2/YbMmGOqaW4W KLetrtUd2zraUj7rXzHsN0SzlqsZHxwaRVwrRXlXIUvM7ryZsFnWIGKxtrQ3wTQi1cII njhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z5ET1mBvwIRdF0u05Gi5NaPWnD/nKaI4QttnFFdy8EE=; b=BaESktwpJnS6c29f8rHPFmUD+GACZj2A4UmCf13CZ3+PO26FkuZDI9A7b99LQkq72l bd6rGURuQRP34kkl8/QH9PlTRZ6HNCuFrXsg2zPL0Tc5FG0QmUcTJa93gr9jV8/naX8K FGD6lUSyLxMe9DR3WOG0WeG2z1Wa4m9vo0FdC22vzM+o6LPVENo3foWiqz5CQjsUMa9O bqWU1XcVC3guXnvBYATKPe+m3L0KegPzP9XP+AFhrN2dG05noLA3i95W7EaiFzCdlnTG ARJna8HJBu8IUqJlCs7zLoPOpO6ZK+L8LE3oIZx/ZydZk1XgkeCMvlhS4meMHVRb1vvd 9Dqw== X-Gm-Message-State: ACrzQf0h6Fa7X7E2ZecFvT/XkE/BiZ24ec9/ztsDHnXpLZ+PgSMXmK9Q CJBLfMjhHUQmjxNVdbui8+0TEVuiDTcd7w== X-Google-Smtp-Source: AMsMyM52klF3SDIa0+tMJn7DLMiGx82a7jaglKFvfImyVX+aSNP2FuQuSxmUvjVjavQANqXwn4Aeew== X-Received: by 2002:a17:902:e747:b0:185:378d:7c00 with SMTP id p7-20020a170902e74700b00185378d7c00mr1857318plf.123.1665655186251; Thu, 13 Oct 2022 02:59:46 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id w8-20020a17090abc0800b0020d43c5c9a0sm2931845pjr.18.2022.10.13.02.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 02:59:45 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Jiewen Yao , Jordan Justen Subject: [edk2-staging/RiscV64QemuVirt PATCH V3 23/34] ArmVirtPkg/PlatformBootManagerLib: Move to OvmfPkg Date: Thu, 13 Oct 2022 15:28:18 +0530 Message-Id: <20221013095829.1454581-24-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221013095829.1454581-1-sunilvl@ventanamicro.com> References: <20221013095829.1454581-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4076 PlatformBootManagerLib in ArmVirtPkg is required for RISC-V also. So, move it to OvmfPkg. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Jiewen Yao Cc: Jordan Justen Signed-off-by: Sunil V L --- OvmfPkg/OvmfPkg.dec | 7 +++++++ .../PlatformBootManagerLibVirt}/PlatformBootManagerLib.inf | 3 +-- .../Library/PlatformBootManagerLibVirt}/PlatformBm.h | 0 .../Library/PlatformBootManagerLibVirt}/PlatformBm.c | 0 .../Library/PlatformBootManagerLibVirt}/QemuKernel.c | 0 OvmfPkg/OvmfPkg.ci.yaml | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) rename {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBootManagerLib.inf (92%) rename {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBm.h (100%) rename {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBm.c (100%) rename {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/QemuKernel.c (100%) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 716c98e084fd..7d2acc5ea0e0 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -463,6 +463,13 @@ [PcdsDynamic, PcdsDynamicEx] # gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x69 + # + # Binary representation of the GUID that determines the terminal type. The + # size must be exactly 16 bytes. The default value corresponds to + # EFI_VT_100_GUID. + # + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x70 + [PcdsFeatureFlag] gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0x1c gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN|0x1d diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBootManagerLib.inf similarity index 92% rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf rename to OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBootManagerLib.inf index 997eb1a4429f..a747ea3feac0 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBootManagerLib.inf @@ -29,7 +29,6 @@ [Sources] QemuKernel.c [Packages] - ArmVirtPkg/ArmVirtPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec @@ -61,7 +60,7 @@ [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits [Pcd] - gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut [Guids] diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBm.h similarity index 100% rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h rename to OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBm.h diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBm.c similarity index 100% rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c rename to OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBm.c diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/OvmfPkg/Library/PlatformBootManagerLibVirt/QemuKernel.c similarity index 100% rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c rename to OvmfPkg/Library/PlatformBootManagerLibVirt/QemuKernel.c diff --git a/OvmfPkg/OvmfPkg.ci.yaml b/OvmfPkg/OvmfPkg.ci.yaml index ff022242b018..c6efb9a8e59e 100644 --- a/OvmfPkg/OvmfPkg.ci.yaml +++ b/OvmfPkg/OvmfPkg.ci.yaml @@ -22,6 +22,7 @@ ], ## Both file path and directory path are accepted. "IgnoreFiles": [ + "Library/PlatformBootManagerLibVirt/PlatformBm.c" ], "skip": True }, -- 2.25.1