From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (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 C85482035BB1B for ; Fri, 17 Nov 2017 08:05:21 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id z3so7449277wme.5 for ; Fri, 17 Nov 2017 08:09:32 -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=oL0wDEvRjCDBiSTHsLQ65UUjTXVVm3EPcmMG3kQua9Q=; b=APpzHszJdU4HyzCVdILG99gG5wvsKNVJSctTw3Qj2VdHHEKTkh3Zf6yBAcRjGBFsx8 ibpKaYnoILW80E9RmCcWJD1eDvnHs8G6tziJRYxpiUmp8M4O0AXhu4Aprq8dYhjQnIvk mVHLTJUlFoqzptV/0lVFSsKV6J6+mzeiD8tR0= 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=oL0wDEvRjCDBiSTHsLQ65UUjTXVVm3EPcmMG3kQua9Q=; b=fN8zAuX25IY5DvNOnpaho2+qpeqZKZfzQo5S/IFaB+uaw0LgarN4QFLbIZe4nMDuLF 2fGiHkcmiGEQ0xrL9o/n2T73xvt48kXi99lmKM8gs+pTfdNmJMY1ewKwuv9pThb4EXZ/ ugaE2IIQiRVYN+soSgqqhzGN+P2xKLY1Er+BS6oaKauCWykXX/5OYeVZ9Fx+4bXl9h4O 0xGklzH/CHHwjZcXZIe2DiaMcQQAUqW4AxOiCdJqGrKxRQFrnK/GSqY+/sT2XmzBaKky TsChPIY1CeAR8mop7XvFNhVzwxFgBKLFo0+MS+DqvJm6veB3U0RXfQNWUFY84zxZo3m3 Kn+g== X-Gm-Message-State: AJaThX4ILZxb1XL9cumhPPS8lyHGBDTYF2QULw+ZPrbj0+r/rM8rQDpn RwGCMoq49AqcvC+XVU8LNNJGjAyEPrQ= X-Google-Smtp-Source: AGs4zMYKkswC21EUUbPjtP1bOgpP89r2LcssfDSwtc1JiWQENXemV1BcxPtRlPk3+Px4Qv9sDVGoIw== X-Received: by 10.28.167.86 with SMTP id q83mr4422268wme.102.1510934971082; Fri, 17 Nov 2017 08:09:31 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id p42sm5575959wrb.28.2017.11.17.08.09.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 08:09:30 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Cc: leif.lindholm@linaro.org, Ard Biesheuvel Date: Fri, 17 Nov 2017 16:09:03 +0000 Message-Id: <20171117160913.17292-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171117160913.17292-1-ard.biesheuvel@linaro.org> References: <20171117160913.17292-1-ard.biesheuvel@linaro.org> Subject: [PATCH 05/15] 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: , X-List-Received-Date: Fri, 17 Nov 2017 16:05:22 -0000 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 --- ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 1 - ArmVirtPkg/PrePi/PrePi.c | 6 ++---- ArmVirtPkg/PrePi/PrePi.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 5e706934f69f..1d79b1360c22 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -52,7 +52,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 d3189c0b8a6f..1ba88e0506cb 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); -- 2.11.0