From patchwork Thu May 5 19:22:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 67228 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp917413qge; Thu, 5 May 2016 12:22:38 -0700 (PDT) X-Received: by 10.66.63.104 with SMTP id f8mr23011073pas.109.1462476157982; Thu, 05 May 2016 12:22:37 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id i10si12969146paz.90.2016.05.05.12.22.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 May 2016 12:22:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6C8E71A1F73; Thu, 5 May 2016 12:22:36 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 776881A1EBF for ; Thu, 5 May 2016 12:22:35 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1564F3B726; Thu, 5 May 2016 19:22:35 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-77.phx2.redhat.com [10.3.113.77]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u45JMVdk015691; Thu, 5 May 2016 15:22:34 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Thu, 5 May 2016 21:22:15 +0200 Message-Id: <1462476147-10404-2-git-send-email-lersek@redhat.com> In-Reply-To: <1462476147-10404-1-git-send-email-lersek@redhat.com> References: <1462476147-10404-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Subject: [edk2] [PATCH 01/13] ArmVirtPkg: duplicate PlatformIntelBdsLib to PlatformBootManagerLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Create a copy of PlatformIntelBdsLib under the name PlatformBootManagerLib, with the following initial changes: - replace PlatformBdsLib references with PlatformBootManagerLib in comments, - replace "IntelBdsPlatform" with "PlatformBm" in file names and their references, - generate a new FILE_GUID. PlatformBootManagerLib will be linked into the BDS driver from MdeModulePkg. This patch parallels OvmfPkg commit 305418818959. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/{PlatformIntelBdsLib/PlatformIntelBdsLib.inf => PlatformBootManagerLib/PlatformBootManagerLib.inf} | 8 ++++---- ArmVirtPkg/Library/{PlatformIntelBdsLib/IntelBdsPlatform.h => PlatformBootManagerLib/PlatformBm.h} | 7 ++++--- ArmVirtPkg/Library/{PlatformIntelBdsLib/IntelBdsPlatform.c => PlatformBootManagerLib/PlatformBm.c} | 6 +++--- ArmVirtPkg/Library/{PlatformIntelBdsLib => PlatformBootManagerLib}/QemuKernel.c | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) -- 1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf similarity index 87% copy from ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf copy to ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index f104accc0334..1ad4c6f220f8 100644 --- a/ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -1,7 +1,7 @@ ## @file -# Implementation for PlatformBdsLib library class interfaces. +# Implementation for PlatformBootManagerLib library class interfaces. # -# Copyright (C) 2015, Red Hat, Inc. +# Copyright (C) 2015-2016, Red Hat, Inc. # Copyright (c) 2014, ARM Ltd. All rights reserved.
# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
# @@ -19,7 +19,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PlatformIntelBdsLib - FILE_GUID = 46DF84EB-F603-4D39-99D8-E1E86B50BCC2 + FILE_GUID = 469184E8-FADA-41E4-8823-012CA19B40D4 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER @@ -31,7 +31,7 @@ [Defines] # [Sources] - IntelBdsPlatform.c + PlatformBm.c QemuKernel.c [Packages] diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h similarity index 90% copy from ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h copy to ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h index 190ce9b294b0..410c309cfcbf 100644 --- a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h @@ -1,6 +1,7 @@ /** @file Head file for BDS Platform specific code + Copyright (C) 2015-2016, Red Hat, Inc. Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available @@ -13,8 +14,8 @@ **/ -#ifndef _INTEL_BDS_PLATFORM_H_ -#define _INTEL_BDS_PLATFORM_H_ +#ifndef _PLATFORM_BM_H_ +#define _PLATFORM_BM_H_ #include #include @@ -53,4 +54,4 @@ TryRunningQemuKernel ( VOID ); -#endif // _INTEL_BDS_PLATFORM_H +#endif // _PLATFORM_BM_H_ diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c similarity index 95% copy from ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c copy to ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 02d698b455b3..f841d7c1b5c6 100644 --- a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -1,7 +1,7 @@ /** @file - Implementation for PlatformBdsLib library class interfaces. + Implementation for PlatformBootManagerLib library class interfaces. - Copyright (C) 2015, Red Hat, Inc. + Copyright (C) 2015-2016, Red Hat, Inc. Copyright (c) 2014, ARM Ltd. All rights reserved.
Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
@@ -27,7 +27,7 @@ #include #include -#include "IntelBdsPlatform.h" +#include "PlatformBm.h" #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c similarity index 96% copy from ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c copy to ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c index 402db97a80a7..ac47d21e71c8 100644 --- a/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c @@ -4,7 +4,7 @@ This implementation differs from OvmfPkg/Library/LoadLinuxLib. An EFI stub in the subject kernel is a hard requirement here. - Copyright (C) 2014, Red Hat, Inc. + Copyright (C) 2014-2016, Red Hat, Inc. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -24,7 +24,7 @@ #include #include -#include "IntelBdsPlatform.h" +#include "PlatformBm.h" // // Static data that hosts the fw_cfg blobs and serves file requests.