From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.9785.1665766186413395260 for ; Fri, 14 Oct 2022 09:49:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=DH6Gr8xC; spf=pass (domain: ventanamicro.com, ip: 209.85.210.182, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pf1-f182.google.com with SMTP id y191so5437014pfb.2 for ; Fri, 14 Oct 2022 09:49: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=Iza9JXPLGGb/dj9ozkh6JmZQ+9/lwJnDwChOXYvt8vM=; b=DH6Gr8xCpLDqoA3qga8J6aKaaXw3HX/qTZwNqZ2sXUxcM8D53vuM4G/J7CUcfQzHtb ay5EcsEjOUCCzhAuHWppsMnet9x8Aiy4fWmO/eLLk1SB2GpIrpaD4sx2Iz21vr8kgCxf x+dqiedueiDdy4ukNkVYWqaOZrSm1DqrlLpSeRmHSE2Fxasor569vPsvMy9ZXOwRO7BE nlt27UMpfefEy5Lv3qHODy1JEzMw8G7dxIPUB+qnznRcrOhEmhAc/SOPxw2ggJ6ip2Gf Kr5KuVR+sqRGcUOnbDkh4Gp4EoQoQAAEq56Lk8LNDYtH0KFF+b+Roi7cEijPlElpwKfR 3C9A== 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=Iza9JXPLGGb/dj9ozkh6JmZQ+9/lwJnDwChOXYvt8vM=; b=l8WgjCFQtwYGJucTp0OC5GLWTsS5fpgbFLlP6ILiYQ742JAFNJlZ4bkjFl0UY45cP+ 4Yl5GFbjCEnshCPNeBoqXrNFZHchf1qd5bRD0AcoNMi1p/XOvjFanm8dv5A809MGb/f5 DiZax5EjfpdA6dfriOiC3pA/ve4tQIDwjdZanclGaMpbDUftAGLe+1h+KIiS4tEU+JGI Bq6rsmPq4eb2DvXZ0t7N+sDJo2ZoDS2uNHu9DApLIG6zkKW3vNocF8QGoPwbW+Xp5Are tdKiYqJy1SwSB3uFZR+SVVrW80NKSL/gS34cSsnXX1BhmqHpyP/yGF51W8L0t3VQodNK xRng== X-Gm-Message-State: ACrzQf2A9Y+pGGtzx+98IhQF4h4CcwEQCLfU7vvmOhCdrptYgTWW8m4s dsucyQiOCW3UJks5kLBCxwDcoEGJ810trA== X-Google-Smtp-Source: AMsMyM6Fsnq2nlF87Ol+iLTttqCgXmNb/mZSMVgF1DJDiDk4yDYqM6wI8ZWvkRcpEA5IO5dKp7r7kg== X-Received: by 2002:a63:1b0e:0:b0:44b:97e8:1020 with SMTP id b14-20020a631b0e000000b0044b97e81020mr5279900pgb.519.1665766185587; Fri, 14 Oct 2022 09:49:45 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id f3-20020a62db03000000b0056265011136sm1963368pfg.112.2022.10.14.09.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 09:49:44 -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 V4 23/34] ArmVirtPkg/PlatformBootManagerLib: Move to OvmfPkg Date: Fri, 14 Oct 2022 22:18:25 +0530 Message-Id: <20221014164836.1513036-24-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221014164836.1513036-1-sunilvl@ventanamicro.com> References: <20221014164836.1513036-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 +++++++ {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBootManagerLib.inf | 3 +-- {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBm.h | 0 {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/PlatformBm.c | 0 {ArmVirtPkg/Library/PlatformBootManagerLib => OvmfPkg/Library/PlatformBootManagerLibVirt}/QemuKernel.c | 0 OvmfPkg/OvmfPkg.ci.yaml | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) 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.38.0