From patchwork Mon Dec 4 22:22:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 120602 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1434325edb; Mon, 4 Dec 2017 14:22:59 -0800 (PST) X-Google-Smtp-Source: AGs4zMbvp1rTXA6rlODsV62T2bmoztkpu/sUtazmvtMFAzMzFa/Gfdl6e7nB2SM62GJUaZot2PNG X-Received: by 10.84.240.1 with SMTP id y1mr16295582plk.391.1512426179093; Mon, 04 Dec 2017 14:22:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512426179; cv=none; d=google.com; s=arc-20160816; b=FHQiuZwVTl5HOcGrT4zNA82AOhqCDimfwBb/w9+zxL/NgS8W/OCPlk6tEmBtUyQFu+ 4rN/uOnouepjgBSVzhQ9314XwajKzIC08MQwDM0Vrl28KTtOwYPhnTpyGu3y8qb2BXZs oA1+53PVTHYL95q6xr0U22aX4PPWl16prO7bGaBlZLZCA6xFownZ2CwFFUTgYOaxfa9E bl/+vtYQTYz4zSL/Z6womGOV6KgP1q8Y+yS8K3H8tZryftnztdmT/KJ7sp0w3rip4l47 S3zGH5LCfU5izJ40wOOjBFUzF+Xg9R+kKNV6Sd/L80Zvgg+0T+bbBt119hyAj4K2qbcg RT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=8+YWRZHnAJpQkj2jPSWsIVOThePLPORGDRI1bm2gNCg=; b=JX8ePKT2m4hzCI/GdZQXzFgvAc+ZvwrkhoGe6BJoMKa64tb6z1z3EHkz91Z14D+qJx Tvpg2lytiQkERrxNUsc7GQXU+OtyCzRL8by4OiH0LSFbqzaT/lyrAqZ1AT5wrU8kFvVe FMVd9uKW0qZo/gCuttHLPvF3KCiiB/lDj08y07pTKbOB3li0Te7bbdHilgWbMwce/vcM lh4L+XWbfKFX0sFDkqVaZN06WCt69DI0o99hlk0qrFzWuPcrBalcH99my5d6Gj5tuOGG Swx7wkicZ1UkZml2ky0KYOChk8+oMYlYnEM5rSS9WJTlk39X/2OUFXNw8Jfz/JQWwgMO M8YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JwJGAYW5; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id u29si10970146pfj.188.2017.12.04.14.22.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 14:22:59 -0800 (PST) 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 header.s=google header.b=JwJGAYW5; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 54424221523A6; Mon, 4 Dec 2017 14:18:28 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (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 DF243220EE086 for ; Mon, 4 Dec 2017 14:18:26 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id g75so8680792wme.0 for ; Mon, 04 Dec 2017 14:22:56 -0800 (PST) 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=lm4gbmE8o5rlO4rXVpFc5hx+YHJfxm8E6cWv9uCg8YM=; b=JwJGAYW5vu8ZC6ofNg+tpiD7CZ/+OLX9H3LXhyA8yOhoHcOu9ELMtW2LtlcY6IC6Uy /3FqwJFYmJjBRswo5ovsrXfn0rpj22tncDa63sUeX4RQg4P4ABsOE0114g+9NVpnr2ab I3AZwfNoyzJQGiWtxnrVWOIIvwNe4Z9KCHkvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lm4gbmE8o5rlO4rXVpFc5hx+YHJfxm8E6cWv9uCg8YM=; b=tO+jIe3fkbuTKH7NPV6qm2ON1XL9AdWwiKFu3qwHr3SIXrXHTF9Oq/ATnLZ1sLD0iR +0fX0+5uBtfBnTLaBL1JkACcXTdXdfQ9H9YPFSGFwpDVRMm8uUuKIwlJ/CA92g6J4hiJ VsbkK/et0WR4DQXzQSRTyY7k5zdy8P9dBWmN5K5LN3wVxHcumVxbBac/BaSxcBiYOraj 61nVZPe5WESNm8s022ZpaUgdxKV+NtHR05req3Apf7MsrslT6L58cDygjWIsQ+OL2HGu hdvnWtFjMYot8g7JEkMKlcxH8jiQrzduqYbqsOi/TnS8VDjGc9xW3O1E8yjniPYPiZr5 5ulw== X-Gm-Message-State: AJaThX6XeYQMyR8awnOGMpmoq0Ey1e5ATIZCf7AcPiyC+utZOkgC/Uz/ ac0XKckYjbDPcoWl2UKemBNzufZEkgg= X-Received: by 10.28.48.150 with SMTP id w144mr8130141wmw.23.1512426175335; Mon, 04 Dec 2017 14:22:55 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id x133sm5667961wmd.44.2017.12.04.14.22.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 14:22:54 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 4 Dec 2017 22:22:31 +0000 Message-Id: <20171204222243.15950-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204222243.15950-1-ard.biesheuvel@linaro.org> References: <20171204222243.15950-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 01/13] ArmPlatformPkg: remove NorFlashArmVExpressLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove NorFlashArmVExpressLib now that it has been moved into edk2-platforms where it belongs. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c | 84 -------------------- ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf | 32 -------- 2 files changed, 116 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c deleted file mode 100644 index a136bff4a1d6..000000000000 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c +++ /dev/null @@ -1,84 +0,0 @@ -/** @file - - Copyright (c) 2011-2014, ARM Ltd. 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 -#include -#include - -#define NOR_FLASH_DEVICE_COUNT 4 - -NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = { - { // BootMon - ARM_VE_SMB_NOR0_BASE, - ARM_VE_SMB_NOR0_BASE, - SIZE_256KB * 255, - SIZE_256KB, - { 0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } } - }, - { // BootMon non-volatile storage - ARM_VE_SMB_NOR0_BASE, - ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, - SIZE_64KB * 4, - SIZE_64KB, - { 0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } } - }, - { // UEFI - ARM_VE_SMB_NOR1_BASE, - ARM_VE_SMB_NOR1_BASE, - SIZE_256KB * 255, - SIZE_256KB, - { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } } - }, - { // UEFI Variable Services non-volatile storage - ARM_VE_SMB_NOR1_BASE, - ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255, - SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks - SIZE_64KB, - { 0xCC2CBF29, 0x1498, 0x4CDD, { 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09 } } - } -}; - -EFI_STATUS -NorFlashPlatformInitialization ( - VOID - ) -{ - // Everything seems ok so far, so now we need to disable the platform-specific - // flash write protection for Versatile Express - if ((MmioRead32 (ARM_VE_SYS_FLASH) & 0x1) == 0) { - // Writing to NOR FLASH is disabled, so enable it - MmioWrite32 (ARM_VE_SYS_FLASH,1); - DEBUG((DEBUG_BLKIO, "NorFlashWriteBlocks: informational - Had to enable HSYS_FLASH flag.\n" )); - } - - return EFI_SUCCESS; -} - -EFI_STATUS -NorFlashPlatformGetDevices ( - OUT NOR_FLASH_DESCRIPTION **NorFlashDevices, - OUT UINT32 *Count - ) -{ - if ((NorFlashDevices == NULL) || (Count == NULL)) { - return EFI_INVALID_PARAMETER; - } - - *NorFlashDevices = mNorFlashDevices; - *Count = NOR_FLASH_DEVICE_COUNT; - - return EFI_SUCCESS; -} diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf deleted file mode 100644 index 0798cc30d8fc..000000000000 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf +++ /dev/null @@ -1,32 +0,0 @@ -#/** @file -# -# Copyright (c) 2011, ARM Ltd. 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 = NorFlashArmVExpressLib - FILE_GUID = c0f5dfa0-7599-11e0-9665-0002a5d5c51b - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = NorFlashPlatformLib - -[Sources.common] - NorFlashArmVExpress.c - -[Packages] - MdePkg/MdePkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec - -[LibraryClasses] - BaseLib - DebugLib - IoLib