From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web09.19013.1665571579774589227 for ; Wed, 12 Oct 2022 03:46:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=et4AZkRM; spf=pass (domain: ventanamicro.com, ip: 209.85.210.177, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pf1-f177.google.com with SMTP id i3so16111405pfk.9 for ; Wed, 12 Oct 2022 03:46:19 -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=et4AZkRMTcNbTCufibd+g2db1/dSBfcVAVPvMzJm8lvRvQHfTFbRtpcal6BertpiMn xOQtO37VgFW+XCMzTevbNX2zQmvrk+M+2FslKu7K0I3O9HEqlKq8FIURjstcMyDMON3q i5wHi2rbU/0eiiYqMIpcUMnK6579q/rs0VKrG5TLLoVnHXurx9bzabV45Sb22xxLJNd2 SCwGAjyMQ/Rkn1hNF5MSGxQou7p5AaDKFinv7iIO8x9giL/jvyQOStr6YAPoFw4KfICQ cuPYRu82mhrkqbuOGObKDlo9lgqHJ0svF5EWMEVF2gGiqo8KnOLAI7iUaWka5K9aWsNF jpCQ== 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=wo9v+hgeP+V8TF9hwks5BOOXBmiL5iTtlaUcS1wC4v3ik8O6o6AwFgxAcV/AWt8OZJ 1dcijUZrmC3vKDRLPdqb0XSQmAxnD1GL0/C1pb7aqsp+KlHxymedFg4kBCZKh2GG9itO uwcEe9kT1jqsws2wfXlvIsJqD7DWRaFgltV2E7If8nx0zAr+cVEAxnm0AI08ZB9yUtZE fUcNuNTCzdtFGKcTUJ4FmCuM1iudJ3+0KqQk1wG5X9BPyDzXrQRe5p++0IVWMI9E4pzd 64N8bjK5Yj5pe7Rgk7JP+PMlCN7XCNs12pBpx/cCiD2y9Fybuw0LOU86FGlCBTZdgNr4 5O2w== X-Gm-Message-State: ACrzQf0KkUssg61gfMfpOuky/4DRBqm4VCmwP2IBzA5nQOeL0yWwDNPD FUzkBjYOWCSJauDFX7RZ23B/2AAk7PdBpw== X-Google-Smtp-Source: AMsMyM70zvUP1SN2BMm0eBrLuxXk+Cp23Uup7BQ2+68ZgzYbSPr9WwTTWZsTFVpIpgIxTJJytO+OjA== X-Received: by 2002:a65:694b:0:b0:43b:f03d:32b0 with SMTP id w11-20020a65694b000000b0043bf03d32b0mr24164731pgq.543.1665571578967; Wed, 12 Oct 2022 03:46:18 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id z4-20020aa79e44000000b0054223a0185asm10812221pfq.161.2022.10.12.03.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 03:46:18 -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 V2 23/33] ArmVirtPkg/PlatformBootManagerLib: Move to OvmfPkg Date: Wed, 12 Oct 2022 16:14:46 +0530 Message-Id: <20221012104456.1393376-24-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221012104456.1393376-1-sunilvl@ventanamicro.com> References: <20221012104456.1393376-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