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:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=PVFQBEQv; spf=pass (domain: ventanamicro.com, ip: 209.85.210.182, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pf1-f182.google.com with SMTP id y191so5437121pfb.2 for ; Fri, 14 Oct 2022 09:49:48 -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=+GQar48mqwFDzjaIaFh2OZ1dQKSdZE0XOl7FNdS4wzM=; b=PVFQBEQvAfauiHgxj6J8bAofZWfZviM+dUdql6B9O0ZnXD5Q4xXxI4M+7EraG3Jz7o 48aON19kOKSEg2haUCfGG1MbFnPxGpVJXcQUiqZpSt/xxPPKqhx+j63FaCJOwla0qwOw AbZrBfRWsbYBJO0VTGHEkhsTirRNQ360WNWhKdpZs9xL13dQ/Hxe9v4kbCxxFNqA1N80 6ohJJvHbQ+YovKW9c5XPrfB1/Id1c+MKFZk8yydHMYUJ3abLcayTz+q7yBYLD3/Q4xMs 6t/0o/Iy3jE7BKxGgj398IN86f35SXxT/2QoyP4jYb17wWUSbJzTCVIsJLYzGQdDS+Hb By1w== 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=+GQar48mqwFDzjaIaFh2OZ1dQKSdZE0XOl7FNdS4wzM=; b=cFBEKLSHReVoY5G4WEtOSaDE2oVvzPt5Aki+LF+cR/YJ5NILqMWUsvXCzF6qMYB/aA UaYMfBW+RI2+1opbZptcFUIxgr5jJoXQ+6MbFgAan1UI15bexUyvfk/3i10a5dOJ4jwe VRGDDpMccOFt5/DDAkIuYTlhqTTrQ/OCy0TYqj6/rI+EDmD5wcCrh6hEPbkM4Gr01Vzx nNrxhvhj3dfXvR/WxYXeyjMOfwZriseBYBaEiJGoOSgDolnBt5Dr4nHDicjPLF9YDwHn jmKuOfV8OYDVCCEoVNPDKuE2QUmJNKGOEO1xCz+KvXni23Lpvvuo/wEmKJMnn6+YEdm1 BVNw== X-Gm-Message-State: ACrzQf0LLhN74P9tTE4A0vL2KQ1tQOb8UlNBmvPFe6+oBiBcuIGWX3lz Xt9Ffcbg5lXtF5j5xjrt399Exz34bFqQDg== X-Google-Smtp-Source: AMsMyM5fipg45nLaoz8cCF0cWGELhRtmXlKs1j/lTNgFUSAv1BdpZqf0BmDDGr0OXtytQbEPv1xewg== X-Received: by 2002:aa7:8893:0:b0:563:89e0:2d43 with SMTP id z19-20020aa78893000000b0056389e02d43mr6208835pfe.25.1665766188396; Fri, 14 Oct 2022 09:49:48 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 09:49:47 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann Subject: [edk2-staging/RiscV64QemuVirt PATCH V4 24/34] ArmVirtPkg: Fix up the paths to PlatformBootManagerLib Date: Fri, 14 Oct 2022 22:18:26 +0530 Message-Id: <20221014164836.1513036-25-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 has been moved to OvmfPkg so that other CPU architectures can reuse. So, update existing paths with the new location. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Signed-off-by: Sunil V L --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ++-- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ++-- ArmVirtPkg/ArmVirtPkg.ci.yaml | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 9112cd6b07dc..0e460d21b2f5 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -71,7 +71,7 @@ [LibraryClasses.common] CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBootManagerLib.inf PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf @@ -167,7 +167,7 @@ [PcdsFixedAtBuild.common] !if $(TTY_TERMINAL) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID - gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94} + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94} !else gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1 !endif diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 21684f3666c8..e3967db53133 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -69,7 +69,7 @@ [LibraryClasses.common] CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibVirt/PlatformBootManagerLib.inf PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf @@ -146,7 +146,7 @@ [PcdsFixedAtBuild.common] !if $(TTY_TERMINAL) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID - gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94} + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94} !else gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1 !endif diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yaml index 1e799dc4e194..552511c2694e 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 -- 2.38.0