From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0D6871A1E05 for ; Thu, 6 Oct 2016 12:12:09 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP; 06 Oct 2016 12:12:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,454,1473145200"; d="scan'208";a="16958353" Received: from asagi-mobl1.amr.corp.intel.com (HELO mdkinney-MOBL.amr.corp.intel.com) ([10.254.78.24]) by fmsmga006.fm.intel.com with ESMTP; 06 Oct 2016 12:12:08 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Date: Thu, 6 Oct 2016 12:12:05 -0700 Message-Id: <1475781125-1472-6-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1475781125-1472-1-git-send-email-michael.d.kinney@intel.com> References: <1475781125-1472-1-git-send-email-michael.d.kinney@intel.com> Subject: [Patch 5/5] QuarkPlatformPkg/RecoveryOemHookLib: Remove RecoveryOemHookLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2016 19:12:09 -0000 Remove the RecoveryOemHookLib class and instance that is no longer used by any modules. Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney --- .../Include/Library/RecoveryOemHookLib.h | 45 ---------------- .../Library/RecoveryOemHookLib/CommonHeader.h | 30 ----------- .../RecoveryOemHookLib/RecoveryOemHookLib.c | 61 ---------------------- .../RecoveryOemHookLib/RecoveryOemHookLib.inf | 49 ----------------- 4 files changed, 185 deletions(-) delete mode 100644 QuarkPlatformPkg/Include/Library/RecoveryOemHookLib.h delete mode 100644 QuarkPlatformPkg/Library/RecoveryOemHookLib/CommonHeader.h delete mode 100644 QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.c delete mode 100644 QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf diff --git a/QuarkPlatformPkg/Include/Library/RecoveryOemHookLib.h b/QuarkPlatformPkg/Include/Library/RecoveryOemHookLib.h deleted file mode 100644 index ea265ad..0000000 --- a/QuarkPlatformPkg/Include/Library/RecoveryOemHookLib.h +++ /dev/null @@ -1,45 +0,0 @@ -/** @file -This library includes the recovery function that can be customized by OEM, -including how to select the recovery capsule if more than one capsule found, -and security check. - -Copyright (c) 2013-2015 Intel Corporation. - -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef __RECOVERY_OEM_HOOK_LIB_H__ -#define __RECOVERY_OEM_HOOK_LIB_H__ - -/** - This function allows the user to force a system recovery - -**/ -VOID -EFIAPI -OemInitiateRecovery ( - VOID - ); - -/** - This function allows the user to force a system recovery and deadloop. - - Deadloop required since system should not execute beyond this point. - Deadloop should never happen since OemInitiateRecovery () called within - this routine should never return since it executes a Warm Reset. - -**/ -VOID -EFIAPI -OemInitiateRecoveryAndWait ( - VOID - ); - -#endif diff --git a/QuarkPlatformPkg/Library/RecoveryOemHookLib/CommonHeader.h b/QuarkPlatformPkg/Library/RecoveryOemHookLib/CommonHeader.h deleted file mode 100644 index 7902254..0000000 --- a/QuarkPlatformPkg/Library/RecoveryOemHookLib/CommonHeader.h +++ /dev/null @@ -1,30 +0,0 @@ -/** @file -Common header file shared by all source files. - -This file includes package header files, library classes and protocol, PPI & GUID definitions. - -Copyright (c) 2013-2015 Intel Corporation. - -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - - -#include - -#include - -#include -#include -#include - -#endif diff --git a/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.c b/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.c deleted file mode 100644 index 28e8b11..0000000 --- a/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.c +++ /dev/null @@ -1,61 +0,0 @@ -/** @file -This file includes the function that can be customized by OEM. - -Copyright (c) 2013-2015 Intel Corporation. - -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include "CommonHeader.h" - -/** - This function allows the user to force a system recovery - -**/ -VOID -EFIAPI -OemInitiateRecovery ( - VOID - ) -{ - UINT32 Data32; - - // - // Set 'B_CFG_STICKY_RW_FORCE_RECOVERY' sticky bit so we know we need to do a recovery following warm reset - // - Data32 = QNCAltPortRead (QUARK_SCSS_SOC_UNIT_SB_PORT_ID, QUARK_SCSS_SOC_UNIT_CFG_STICKY_RW); - Data32 |= B_CFG_STICKY_RW_FORCE_RECOVERY; - QNCAltPortWrite (QUARK_SCSS_SOC_UNIT_SB_PORT_ID, QUARK_SCSS_SOC_UNIT_CFG_STICKY_RW, Data32); - - // - // Initialte the warm reset - // - ResetWarm (); -} - -/** - This function allows the user to force a system recovery and deadloop. - - Deadloop required since system should not execute beyond this point. - Deadloop should never happen since OemInitiateRecovery () called within - this routine should never return since it executes a Warm Reset. - -**/ -VOID -EFIAPI -OemInitiateRecoveryAndWait ( - VOID - ) -{ - volatile UINTN Index; - - OemInitiateRecovery (); - for (Index = 0; Index == 0;); -} diff --git a/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf b/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf deleted file mode 100644 index b8ec7c3..0000000 --- a/QuarkPlatformPkg/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf +++ /dev/null @@ -1,49 +0,0 @@ -## @file -# Library Hook Point functions for Intel QNC. -# -# This library provides hook points for OEM w.r.t recovery -# -# Copyright (c) 2013-2015 Intel Corporation. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = RecoveryOemHookLib - FILE_GUID = DE6D4FB9-12DB-4dbb-ACF1-92514388355F - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = RecoveryOemHookLib - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 -# - -[Sources] - RecoveryOemHookLib.c - CommonHeader.h - - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - QuarkPlatformPkg/QuarkPlatformPkg.dec - QuarkSocPkg/QuarkSocPkg.dec - -[LibraryClasses] - QNCAccessLib - ResetSystemLib - -[Ppis] - gEfiPeiDeviceRecoveryModulePpiGuid # PPI SOMETIMES_CONSUMED - -- 2.6.3.windows.1