From patchwork Wed Mar 29 13:48:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96195 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp2208566qgd; Wed, 29 Mar 2017 06:48:59 -0700 (PDT) X-Received: by 10.99.213.81 with SMTP id v17mr654264pgi.130.1490795339813; Wed, 29 Mar 2017 06:48:59 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id a96si7531480pli.151.2017.03.29.06.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 06:48:59 -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 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 6212D2041D9EA; Wed, 29 Mar 2017 06:48:56 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x235.google.com (mail-wr0-x235.google.com [IPv6:2a00:1450:400c:c0c::235]) (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 AD2C52041D9C8 for ; Wed, 29 Mar 2017 06:48:54 -0700 (PDT) Received: by mail-wr0-x235.google.com with SMTP id k6so9922786wre.2 for ; Wed, 29 Mar 2017 06:48:54 -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=0P6i8n0oJv094OfJIqkCcL3f+6IGm6oL7lrnGsSJDcU=; b=kiu8j7MSia00jP4OtzT+uXyCo16goWXO/mjtU5iZUw90bDEqz2aFtlsFzqJjlbAijn 9UMOYPbQRqSHjtlVnhyx3MAuK3mAqAXW8sg4LaD85KPy2E00vzYBkwsDOMNrMm5u32yJ 2wjnOl7BGKx5p8JblXNFyVwkbLG4W5FwwXTQY= 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=0P6i8n0oJv094OfJIqkCcL3f+6IGm6oL7lrnGsSJDcU=; b=t2KYwn3JifRsLMsFtFZTygqmX5gySUaEk+Uh2YHJ1w71XxkutFLQQugGGIoIt4c20J aSDXqIYPFPWC/97aawajCkJQ4oeQ790+X/rApG/K0+Lddt4Gt0x5HnblsuxwrQ3sH8zi j5vXoThCf9Be7QBPA0puAztKXjPSLlzf7ox43PJ34bBFME0/i5HuZSRcc3XIDlxIpgkZ pe9dLcOiDPrvNzq/kFQoEWfyf5yyl0gycqnvpJDLpPpL5RpbaxEROCc5rsf5RW9zWnS7 VA+fzm+NO7QfoFgn/XJHpsMeKn2wEIbK0xcQqetkLZ8FtrREnpGMYFetFtpL8rPzZVTK TbwA== X-Gm-Message-State: AFeK/H1ZUBInbVwJwMwYSBJGZ7ZF1Cf98Yo0K1UIGZ4UP36dhiIBk5+aGqAIxN/QKsVS6A2F X-Received: by 10.28.184.87 with SMTP id i84mr841498wmf.129.1490795333260; Wed, 29 Mar 2017 06:48:53 -0700 (PDT) Received: from localhost.localdomain ([196.81.160.3]) by smtp.gmail.com with ESMTPSA id h65sm9479406wrh.32.2017.03.29.06.48.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 06:48:52 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Wed, 29 Mar 2017 14:48:32 +0100 Message-Id: <20170329134833.12956-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170329134833.12956-1-ard.biesheuvel@linaro.org> References: <20170329134833.12956-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 5/6] ArmPlatformPkg/ArmVExpressDxe: remove unused cruft from ArmHwDxe 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: ryan.harkin@linaro.org, lersek@redhat.com, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove unused cruft from ArmHwDxe -- the only thing that remains is installation of the 'runaxf' shell command. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c | 43 +------------------- ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf | 3 -- 2 files changed, 1 insertion(+), 45 deletions(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c index 351c73312dc4..19efa3c23dea 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c @@ -12,49 +12,8 @@ **/ -#include "ArmVExpressInternal.h" #include - -CONST EFI_GUID ArmHwA9x4Guid = { 0x2fd21cf6, 0xe6e8, 0x4ff2, { 0xa9, 0xca, 0x3b, 0x9f, 0x00, 0xe9, 0x28, 0x89 } }; -CONST EFI_GUID ArmHwA15x2A7x3Guid = { 0xd5e606eb, 0x83df, 0x4e90, { 0x81, 0xe8, 0xc3, 0xdb, 0x2f, 0x77, 0x17, 0x9a } }; -CONST EFI_GUID ArmHwA15Guid = { 0x6b8947c2, 0x4287, 0x4d91, { 0x8f, 0xe0, 0xa3, 0x81, 0xea, 0x5b, 0x56, 0x8f } }; -CONST EFI_GUID ArmHwA5Guid = { 0xa2cc7663, 0x4d7c, 0x448a, { 0xaa, 0xb5, 0x4c, 0x03, 0x4b, 0x6f, 0xda, 0xb7 } }; -CONST EFI_GUID NullGuid = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }; - -// -// Description of the four hardware platforms : -// just the platform id for the time being. -// Platform ids are defined in ArmVExpressInternal.h for -// all "ArmVExpress-like" platforms (AARCH64 or ARM architecture, -// model or hardware platforms). -// -//Note: File extensions are stripped with the VExpress NOR Flash FileSystem -CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = { - { ARM_HW_A9x4, &ArmHwA9x4Guid, L"ca9" }, - { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"ca15a7" }, - { ARM_HW_A15, &ArmHwA15Guid, L"ca15a7" }, - { ARM_HW_A5, &ArmHwA5Guid, L"ca5s" }, - { ARM_FVP_VEXPRESS_UNKNOWN, &NullGuid, NULL } -}; - -/** - Get information about the VExpress platform the firmware is running on. - - @param[out] Platform Address where the pointer to the platform information - (type ARM_VEXPRESS_PLATFORM*) should be stored. - The returned pointer does not point to an allocated - memory area. Not used here. - - @retval EFI_NOT_FOUND The platform was not recognised. - -**/ -EFI_STATUS -ArmVExpressGetPlatform ( - OUT CONST ARM_VEXPRESS_PLATFORM** Platform - ) -{ - return EFI_NOT_FOUND; -} +#include /** * Generic UEFI Entrypoint for 'ArmHwDxe' driver diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf index 1a007627ad3f..1ecdbb0b231e 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf @@ -22,12 +22,9 @@ [Defines] [Sources.common] ArmHwDxe.c - ArmVExpressCommon.c [Packages] - ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec [LibraryClasses]