From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.7592.1582722848637994965 for ; Wed, 26 Feb 2020 05:14:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=i3xUHBiV; spf=pass (domain: linaro.org, ip: 209.85.221.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f67.google.com with SMTP id e8so2966266wrm.5 for ; Wed, 26 Feb 2020 05:14:08 -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=HzzEuVPak+SGYWy5IcMheGLL9snf+QsOCFJXIBJUpzA=; b=i3xUHBiVwU2WoPhiRcKs85WHxW167WU/tZRSjjcNjzqoBkaaCsRLfGh1pT6oZBxpc6 AeWEsuQ2QEF1vFlNSvVbxJqnzDo3HOy2HWs8h8n2hnIz6BPguRKBUl9auqbHuLOPgl95 M8T0Br/FjmpuSPhXNvWsTPFyJFyq5xOSan03oZKpNcpMj/JTeDH9aVNBeH5L1wfERbEy tVb7DBAex1TOodE6eJ4V+wB9/zpkPaacLoPZZpHKiX0TzuSsym9Rftn4lc4hjoqn9Qqx VbWS7D0vMfzx15B1X97Zxx1ff+SpdPKQtwlRBjCaMS5JDpmfaHT524pwl09NXCHhcbAa b7rw== 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=HzzEuVPak+SGYWy5IcMheGLL9snf+QsOCFJXIBJUpzA=; b=NcRfIyGrxEbiQdGD/IrmAIvPFckpnL2xOVrJPvPbu55ntv0a1meaFk/mw3gkBxVo0e ELZLpdNi+q/ylFMNa2MZxnuF2tAWJ2sMjwmvRMFLijKj8j6Rr2N10O9R6551Q6BwSK7g 04rG3IzqTWILP/WRzBh9gGReMbcM+VqtG+7zWmU4p9Xfl2SZyeKr9n52/JQcJwi1MOi6 kRAbPpQ1DeNL1FhrnDfEnyerIAzkXhPcGe5P0SATrMLWWldY+0+GHF9gYGXC/Xb2xdQU 6hdOaJ3P6lWjUEsKMfTm2OwRMVkuaR2CqeHvB6xeEcYX3levAfoTR/lv6hFlf7BWGjht Fe1Q== X-Gm-Message-State: APjAAAU1li0KfWgLwP4jR3BwVatIbQmQHvrVHSytD3QLL1yu6U+oBYV1 /Ub/febR6W1cN8KLXFq+KNcK74d6cKVxRA== X-Google-Smtp-Source: APXvYqz5iluBexBkwiybVk8ZDeic81ah0q1U6FRusqbZF6VDZn920ogYFc9yxolYYO0TS4HI4wZPpg== X-Received: by 2002:a5d:6408:: with SMTP id z8mr5618608wru.122.1582722846841; Wed, 26 Feb 2020 05:14:06 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id s8sm3321690wrt.57.2020.02.26.05.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 05:14:05 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, Ard Biesheuvel Subject: [PATCH 1/3] ArmPkg/ArmLib: clean up library includes Date: Wed, 26 Feb 2020 14:14:00 +0100 Message-Id: <20200226131402.30317-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226131402.30317-1-ard.biesheuvel@linaro.org> References: <20200226131402.30317-1-ard.biesheuvel@linaro.org> Suspiciously, ArmLib's INF does not contain a [LibraryClasses] section at all, but it turns out that all the library includes it contains (except for ArmLib.h itself) are actually bogus so let's just drop all of them. While at it, replace with the more accurate for a BASE type module, and put the includes in a consistent order. Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c | 9 +++++---- ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c | 10 ++++++---- ArmPkg/Library/ArmLib/ArmLib.c | 2 -- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c index 0ed8dae9a4b0..924bf48020e0 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c @@ -7,11 +7,12 @@ **/ -#include -#include +#include + #include -#include -#include + +#include + #include "AArch64Lib.h" #include "ArmLibPrivate.h" diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c index 38516d4f1b87..5d93aa6e0b8c 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c @@ -6,11 +6,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include -#include + +#include + #include -#include -#include + +#include + #include "ArmV7Lib.h" #include "ArmLibPrivate.h" diff --git a/ArmPkg/Library/ArmLib/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c index c682c3ab6339..3905d02c5e7e 100644 --- a/ArmPkg/Library/ArmLib/ArmLib.c +++ b/ArmPkg/Library/ArmLib/ArmLib.c @@ -10,8 +10,6 @@ #include #include -#include -#include #include "ArmLibPrivate.h" -- 2.17.1