From patchwork Mon Sep 5 11:06:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 75370 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp16522qgf; Mon, 5 Sep 2016 04:06:19 -0700 (PDT) X-Received: by 10.66.120.11 with SMTP id ky11mr16132564pab.79.1473073579844; Mon, 05 Sep 2016 04:06:19 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id dv15si28866044pac.75.2016.09.05.04.06.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Sep 2016 04:06:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6B9F61A1E2E; Mon, 5 Sep 2016 04:06:19 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 54FB51A1E2C for ; Mon, 5 Sep 2016 04:06:17 -0700 (PDT) Received: by mail-wm0-x233.google.com with SMTP id 1so132787695wmz.1 for ; Mon, 05 Sep 2016 04:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a5m56SIO4bZ4T5rCwAcyo9wO1IpjaM/Cql5HywqVnz4=; b=aAkUJsaosgN1ZgvB3gXuYe4txDq3BDBb+7XqXfK6QtfZru+6xCHl6deDDz7nd7yI1L uY+zqZ8vCl5Zr+I8VwtiXlh0O6UU5hQTjQzGtWONpNnkijCVAvbPJt0MuDHK0G5q8UL3 q+9ZH5K4YbIMJkHplPsg0S6+mupEuweQwNu8A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a5m56SIO4bZ4T5rCwAcyo9wO1IpjaM/Cql5HywqVnz4=; b=WNWE3lM5CBh1kuHS1ILRMONaYuk0fhcgSEEL82HAGWadYnpGSZzKW7uS6biREjMU28 MUsyEy2MRJwaVZ0HM8hztoHiv2JiGaKhYBnLVmgdgDpVcQG7apDkveqtULCw/XzOAwOX Ghvfvt+FpXCm5RG5g9OnAY1ZP21ZMQoI/eUXY9Wiceo5ih9458F8NTuo0aH5pj8Lpp7p rHFZlE2PjvIqThyDfHL8FwfDqn15i50BER9FLk13R1gp+kwx/z+ClfKBI++4/TyK8KGW 8Kdhr1f9MH29YDhc6bbYGzj9U9qOBID/oN8w425CyfZY5HfUn0JiFHm2/2Rtrth0/Drm e6GQ== X-Gm-Message-State: AE9vXwOT4Y+gRGtrlhvsVauQHiNeaBI54xZAXQFEoJH8mJzKBxCUVPCnBW2HfH31Creo8Ejq X-Received: by 10.194.95.105 with SMTP id dj9mr33166131wjb.20.1473073575818; Mon, 05 Sep 2016 04:06:15 -0700 (PDT) Received: from localhost.localdomain ([197.130.133.164]) by smtp.gmail.com with ESMTPSA id cf1sm22442395wjc.29.2016.09.05.04.06.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 04:06:15 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com Date: Mon, 5 Sep 2016 12:06:02 +0100 Message-Id: <1473073566-1504-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> References: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/5] ArmPkg/ArmLib: remove NullArmLib 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove the NULL instance of ArmLib: it is not currently used, and its usefulness its dubious. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dsc | 1 - ArmPkg/Library/ArmLib/Null/NullArmLib.c | 117 -------------------- ArmPkg/Library/ArmLib/Null/NullArmLib.inf | 41 ------- 3 files changed, 159 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 6f9fc661fbdc..e26ca035f555 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -111,7 +111,6 @@ [Components.common] ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf - ArmPkg/Library/ArmLib/Null/NullArmLib.inf ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf ArmPkg/Library/BdsLib/BdsLib.inf ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.c b/ArmPkg/Library/ArmLib/Null/NullArmLib.c deleted file mode 100644 index e7e9c52547d7..000000000000 --- a/ArmPkg/Library/ArmLib/Null/NullArmLib.c +++ /dev/null @@ -1,117 +0,0 @@ -/** @file - - Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
- - 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 -#include -#include - -VOID -EFIAPI -ArmCleanInvalidateDataCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmCleanDataCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmInvalidateInstructionCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmInvalidateDataCacheEntryByMVA ( - IN UINTN Address - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmCleanDataCacheEntryByMVA ( - IN UINTN Address - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmCleanInvalidateDataCacheEntryByMVA ( - IN UINTN Address - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmEnableDataCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmDisableDataCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmEnableInstructionCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} - -VOID -EFIAPI -ArmDisableInstructionCache ( - VOID - ) -{ - // Do not run code using the Null cache library. - ASSERT(FALSE); -} diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf deleted file mode 100644 index 6cfb2c4eac8f..000000000000 --- a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf +++ /dev/null @@ -1,41 +0,0 @@ -#/** @file -# Semihosting serail port lib -# -# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
-# -# 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 = NullArmLib - FILE_GUID = 00586300-0E06-4790-AC44-86C56ACBB942 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = ArmLib - -[Sources.common] - ../Common/ArmLib.c - - NullArmLib.c - -[Sources.ARM] - ../Common/Arm/ArmLibSupport.S | GCC - ../Common/Arm/ArmLibSupport.asm | RVCT - -[Sources.AARCH64] - ../Common/AArch64/ArmLibSupport.S - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[Protocols] - gEfiCpuArchProtocolGuid