From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web12.8286.1667136593450900454 for ; Sun, 30 Oct 2022 06:29:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=jIq1UIGn; spf=pass (domain: ventanamicro.com, ip: 209.85.214.180, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pl1-f180.google.com with SMTP id c24so8650417pls.9 for ; Sun, 30 Oct 2022 06:29:53 -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=BTM+UpY+ngqlZCsTute+637pUWr9NPtl210Cz9PfN7Y=; b=jIq1UIGnlJyy7AnTTu9nDgsyF5BsjMmfy2Dzzq90ShmLZsUoQDLXySAdDDX+wsDsWH 8LcgP6Zn63mBmi5OpK93cdAA2j4ZKm6lJkrjFxlXc60MSw8iQg10NVZ8j2ERtsOwZkNy gz1dx1NmDyv8LKgar2fStlKjG1f2D3MDKiMcsfdjJ3JDgMRJVMn9K2DNYD/4wSZlMunr DEV09pk9B92YiEQQD6OOFo8iO3XrjovGF5xJ5MI8jB8CI5WksJEwWkYIangxdyFlgIDm 6Wq22G0YXX1mu2ThPyNy1CRswsHBnj+IMA8H4Tbc1hn6jvJJICgtEnFfjON3vb0JYTjn 09pg== 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=BTM+UpY+ngqlZCsTute+637pUWr9NPtl210Cz9PfN7Y=; b=tSCyL+X2qfSuLypsYyGzqld/HTVoMwVQzrw1kFRx/t7woZJluzriTkWsfh65ZV3gye SAyrTDQ7yvV34Jn/GB9vuuwhUnBMShOIPeN800j1YrmEim5ZDabEgsKKv6Koq76LUoi4 7lHnAHMlfV/2Szg3sA+aCyIWoH584vfm+896nI9t4qHOepFCMdgmiiUdLEKaP2YcDNxx gADGgaNaQb2CYTR6iBYwoV57h5RjW3IjAOLdRN5OAL/MdZQ3kcLERuvJzf69PD53oD3E NQd+h+kZ0HS8u9mEkIolwajrcSriuzcP5fN5av6L7/FYoOVUnIR3/MTdOcFjVBs6KgJm rFwg== X-Gm-Message-State: ACrzQf1+E5L1RANSpvEcnkjmTCQYVZL4b9Vy6g0dXhLUPPLVr9v65NfP AGMKk6Ra8OvvDumgHF23sC8hQHz26sWQPA== X-Google-Smtp-Source: AMsMyM5cVBW7DFeP/I0DoM7wERq2IS+FYK8LsJQsJ5y8vS1GP2uFOd8M52PCPEhOXdLG41iZVEcPkA== X-Received: by 2002:a17:902:ebc7:b0:17e:7378:1da8 with SMTP id p7-20020a170902ebc700b0017e73781da8mr9295056plg.152.1667136592738; Sun, 30 Oct 2022 06:29:52 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.12.236]) by smtp.gmail.com with ESMTPSA id r10-20020aa79eca000000b0056b6a22d6c9sm2612330pfq.212.2022.10.30.06.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 06:29:52 -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 V5 24/30] ArmVirtPkg: Fix up the paths to PlatformBootManagerLib Date: Sun, 30 Oct 2022 18:58:36 +0530 Message-Id: <20221030132842.54077-25-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221030132842.54077-1-sunilvl@ventanamicro.com> References: <20221030132842.54077-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 2ed1e15a08ca..1d8b6dc9c04c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.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 @@ -173,7 +173,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 d6f4ac5166d7..91119c2df9c4 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