From patchwork Wed Nov 22 10:07:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 119448 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp6489317qgn; Wed, 22 Nov 2017 02:07:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMbgLSGjfKgyh5CG0QjvsOp1Pz5aitD8J9ct0Y4orLWLlCV2CE4LXo2U3ttluSXoINeuoODp X-Received: by 10.84.246.194 with SMTP id j2mr20618618plt.7.1511345277299; Wed, 22 Nov 2017 02:07:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511345277; cv=none; d=google.com; s=arc-20160816; b=dSx0t853Jn/i27XSwaIg0490j5WdU1xJe/jobf0zlQD57It5+Mpcs1a59J5twS0Xh0 I3CgPhO1m0os+iPBVS3OGi5w2Z5tBvont7ifAWgVI1Kyudjj1jIz51f4l9lt3lEZ3kZd XTU99QwAjr+7XgPEOzDYFDxK6M7C99zTv2TJeekYRNcY0u5COEMzrBzab8Sp4v1J627p hrVcy4e7i1zm0mFppPX1Gbch6DmSyGGOfVcNB0pfpzWbmz95jTSUgVL8/ufkdKb7o6cS aDs9mNYi39MYgp+ck4gIp8Rgu01BKHEimlYn5522n60rRaVNrr30va0x3El+2/gwGkUQ kNdQ== 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=PekHIC1f3rntD4NExBH13IPhRNnzAwFw8l+CTPygZCY=; b=PhpJ3qxZL4afD9BaLB7xRUbhsOcgOFrCmbjJ8PY5womZsHxx2ulpLKkxZvK/Ke6Tf1 1NIZcnyR5GMFi330BNC0Yf4OkngIePwhYQ93Lq8weyJRqJVbkUIv9J947Zh3/uDReuhF joPCCPb4xmHVSD1MzSSPyEhdala/85kmsgodU0E4ovoliLKXHLlFdXhv8ezXP5aDRQ7C Iaec87DoT1r83+35tNPHwagfoBu4CYSdUULTlSv4CeJYIuv5SigHNGjEZ3cx3pTjAOUd Vj8N7Hg/zQoiwNhHMElvdljFpFdZ64lQqRwXP38s/2ErZjnvtwaGCnSeSCFFyCzuk7ew PlyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=csbM0+bv; 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 x4si12852341plw.539.2017.11.22.02.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 02:07:57 -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=csbM0+bv; 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 47494220C1619; Wed, 22 Nov 2017 02:03:36 -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 B0BA9220C1600 for ; Wed, 22 Nov 2017 02:03:32 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id y80so8942100wmd.0 for ; Wed, 22 Nov 2017 02:07:48 -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=s8a7BepvxOiDHDmKylPl4/JljNSAVz+zBtKnC0RblEQ=; b=csbM0+bvvTXeixlf3EwknxSgHfigCx90pcv4yaPS62w/Liaqzb3rY+yrYSkXl9VnQt psz3tjQubHYXuaIu515HecH9DSF1fFaWW8AeyxDcUcxoiAXRqAmfkGBYbAbIdlWV39oy 3ZPtBWwjRaLBlz/GSpskaE8NIQgyuC83XOWrc= 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=s8a7BepvxOiDHDmKylPl4/JljNSAVz+zBtKnC0RblEQ=; b=ZlwwNloCOivivXXhm6xkkhZyVk0WFL9ejWEV3gGBy45NSGpPvCW37bE38c2MG9OLsM ZS9N02W7F+T4kxysSlQBuJF/FhhkAhnwAMtKmEnOFfuJcFkeOO0PvpSMvr2OcDmc1tyZ WxqslsSjirb82LJLZJd32PieUJ/xscBJ2JirJDKrkqM2WYm3zSZhcNUf61sh3e1Rmkn7 ZpTbqqzwk3+NFhWZUOA0w+HWFyv/vRo1BemBWzZMC610bqn6v5aUyRY0nKvjZCbJ0odr lc2RYyTPd6dgmLhFxmoExFUtKBcm274Q69o2envPubYQ3R+JY8TtxPO3RR7tOTgZC1/K Luww== X-Gm-Message-State: AJaThX7L9off2FIgBk3b+6PuFCaHuZb47Kay/vdIVidxAVok42C1XaTb Y/tGpT45+MNYrZ6X6DK9qtWDLipEKFk= X-Received: by 10.28.14.85 with SMTP id 82mr3386948wmo.120.1511345267331; Wed, 22 Nov 2017 02:07:47 -0800 (PST) Received: from localhost.localdomain ([154.145.25.106]) by smtp.gmail.com with ESMTPSA id i192sm2761457wmf.46.2017.11.22.02.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 02:07:46 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 22 Nov 2017 10:07:22 +0000 Message-Id: <20171122100731.24525-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171122100731.24525-1-ard.biesheuvel@linaro.org> References: <20171122100731.24525-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 05/14] ArmVirtPkg/PrePi: remove dependency on ArmPlatformLib 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove the pointless dependency on ArmPlatformLib: none of the code we call from it actually does anything useful. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 1 - ArmVirtPkg/PrePi/PrePi.c | 6 ++---- ArmVirtPkg/PrePi/PrePi.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 789a896857aa..e816e9583da8 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -54,7 +54,6 @@ [LibraryClasses] LzmaDecompressLib PeCoffGetEntryPointLib PrePiLib - ArmPlatformLib ArmPlatformStackLib MemoryAllocationLib HobLib diff --git a/ArmVirtPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c index c4fa979c43ef..fce4ab9428a5 100755 --- a/ArmVirtPkg/PrePi/PrePi.c +++ b/ArmVirtPkg/PrePi/PrePi.c @@ -13,6 +13,7 @@ **/ #include +#include #include #include @@ -85,7 +86,7 @@ PrePiMain ( BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); // Set the Boot Mode - SetBootMode (ArmPlatformGetBootMode ()); + SetBootMode (BOOT_WITH_FULL_CONFIGURATION); // Initialize Platform HOBs (CpuHob and FvHob) Status = PlatformPeim (); @@ -123,9 +124,6 @@ CEntryPoint ( { UINT64 StartTimeStamp; - // Initialize the platform specific controllers - ArmPlatformInitialize (MpId); - if (PerformanceMeasurementEnabled ()) { // Initialize the Timer Library to setup the Timer HW controller TimerConstructor (); diff --git a/ArmVirtPkg/PrePi/PrePi.h b/ArmVirtPkg/PrePi/PrePi.h index 153f06b9c7fb..14c9bf92c115 100644 --- a/ArmVirtPkg/PrePi/PrePi.h +++ b/ArmVirtPkg/PrePi/PrePi.h @@ -25,7 +25,6 @@ #include #include #include -#include #define SerialPrint(txt) SerialPortWrite (txt, AsciiStrLen(txt)+1);