From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by mx.groups.io with SMTP id smtpd.web11.15501.1583345590024092813 for ; Wed, 04 Mar 2020 10:13:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=LGsFBojz; spf=pass (domain: linaro.org, ip: 209.85.210.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-ot1-f68.google.com with SMTP id v19so2962398ote.8 for ; Wed, 04 Mar 2020 10:13:09 -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=LGsFBojzlGOOVLBNBVBazm2oqIitq6uKxdE9xZ0U5BVZlPp63Ly3A8vIHrEV6mxkAv TxmMOYyCq3fEFHePhysQQzIddqXpaLHhTp2Hs3XBCkLo9Ov/JyIlDlxfO1tA12FSW5XS 47L63jVmSqW39oNvrIzkJw5tWcTpkjz7k18fLhmf0gzHFHMF2flzqzvuW4homsQsDhWI F786d2sYdEV5s376DhI1IiBdJusemBoVNs+QobE8G0BbZDhUr5AO+W1wyz9ARc7Sn+LV SOKilXqd5mO8EpvCOU3clsdslebJcTNafQmhihFq5BDElAADe7dqmuIElmCh0xnqEa2X 4HlA== 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=jtCZkti7gwnd9xi0Bkwr7+qKRX4039I4RgRYCH4/FKWTZdznmeWhw+2sMpIepKNLOj E3nbR8L/Qe4gjAkdQkTY7amEEkcSTgfffE97wcahfG6R2SU7RGjIrBu8ErAC/QRRAsUV V9hZC2VY/ECjNsoWSbnkLm0+Eh/PXa3bhomPfcCpJUR2qWeNLv6vq0GDAkRb4U6QJ3Pa Iucv0/QcHqNWjBtns156H14RHpoB+duke4ssjZPE623gVcJF2nRY/8HfyOMGUqFLzRdB HcbloN/KsYq3K8Y40tKbm3TbxP1Ha0QQll/f3Qsc8M5uJzT1EDEdkVzbGrFy9BnVtIOW SgDw== X-Gm-Message-State: ANhLgQ2osfUWsE/VgElrpkkfX0pi6Pu3UqnKUJ/fbaT6SfeonI7FyRTk 4ePxI/ZOUQNiGqUg1JR5VZ+gSan94H3f4A== X-Google-Smtp-Source: ADFU+vtE6dwhWYAbsNQ5jjUjbe0+NVFOGskiq6AKpEkDodKagHIsGNyToH/Y+gBSEOGUjgaTaJ31Aw== X-Received: by 2002:a05:6830:1e09:: with SMTP id s9mr3199627otr.149.1583345588531; Wed, 04 Mar 2020 10:13:08 -0800 (PST) Return-Path: Received: from cam-smtp0.cambridge.arm.com ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id p65sm9083971oif.47.2020.03.04.10.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 10:13:07 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, Ard Biesheuvel Subject: [PATCH v2 7/9] ArmPkg/ArmLib: clean up library includes Date: Wed, 4 Mar 2020 19:12:44 +0100 Message-Id: <20200304181246.23513-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304181246.23513-1-ard.biesheuvel@linaro.org> References: <20200304181246.23513-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