From patchwork Thu Sep 8 09:44:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 75746 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp749212qgf; Thu, 8 Sep 2016 02:44:39 -0700 (PDT) X-Received: by 10.66.8.169 with SMTP id s9mr21976993paa.58.1473327879268; Thu, 08 Sep 2016 02:44:39 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id u65si46370194pfk.116.2016.09.08.02.44.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 02:44:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; 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 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D87E31A1F5C; Thu, 8 Sep 2016 02:44:38 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 AB1461A1F5C for ; Thu, 8 Sep 2016 02:44:36 -0700 (PDT) Received: by mail-wm0-x232.google.com with SMTP id b187so158389555wme.1 for ; Thu, 08 Sep 2016 02:44:36 -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=D3rUFi7oX5oz4Y03Kqf02pi455H4k6k3XYlIPkF+77o=; b=XwFe4S9crHdy8Fgy03wl5GKGDUkXQCf69uMU7U3ePn7dnI071MuOnZlbTtxA2vKJ3C aPJifXNMHGVHzgK5bJoskK3ZfpGUhfCtTZGln9BPOoHhaEJPiUBbyzOk3cxk05JPeVtN 1z8q9/cp3URpxZ20S/ZUvHcdG2OH6fuEn2WMM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D3rUFi7oX5oz4Y03Kqf02pi455H4k6k3XYlIPkF+77o=; b=M7241/czrYknya5Lc6AjmYQOl0xc5Q7oa4I6L4RTxEk/DJYtPrznGEssbe+l0ylVBS Q4fPcb1tbIol99cjcYJTrkNex5PCtyAIEDIc3pPj5YjfN/ONTI5Q+P1bDCt4OIJSx4jz JOcJP49hQP8BYGElpSEVGUMkAlqr53nMLpixS78y8iAVAfnacBV7R4098fqUCH534ULc NUWF+lNlqX3RWf6ZTesOFeUNZoLJ2G/LWFZ2hJXBQdc5Fz6MdAASI7icbNvEwkns8R9C 6hu5XJoNp+Wl6v0cjN7Sn9UDq7J3Yxc1u/yvp74d7XGu/agu/wJ9s8mnWSr+mJ1Btu7X VgPw== X-Gm-Message-State: AE9vXwNN1N95g+O1rOk4+6XTvVOAIr1broOzKHKw5Cypf/fWc+Srush7wDRSlS7+VINe41wD X-Received: by 10.28.158.1 with SMTP id h1mr8590325wme.94.1473327875054; Thu, 08 Sep 2016 02:44:35 -0700 (PDT) Received: from localhost.localdomain ([197.130.133.164]) by smtp.gmail.com with ESMTPSA id 1sm2840474wmm.0.2016.09.08.02.44.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 02:44:34 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Thu, 8 Sep 2016 10:44:28 +0100 Message-Id: <1473327868-17953-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473327868-17953-1-git-send-email-ard.biesheuvel@linaro.org> References: <1473327868-17953-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/2] ArmPkg/ArmBaseLib: clean up directory structure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 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" For historical reasons, the files under ArmLib are split up into 'common' files under Common/, containing common C files as well as AArch64 and Arm specific asm files, and ArmV7 and AArch64 files under ArmV7/ and AArch64/, respectively. This presumably dates back to the time when ArmLib supported different revisions of the 32-bit architecture (i.e., pre-V7) Since the PI spec requires V7 or later, we can simplify this to Arm/ and AArch64, which aligns ArmLib with the majority of other modules that carry ARM or AArch64 specific code. So move the files around so that shared files live at the same level as ArmBaseLib.inf, and ARM/AArch64 specific files live in Arm/ or AArch64/, respectively. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmLib/{Common => }/AArch64/ArmLibSupport.S | 0 ArmPkg/Library/ArmLib/{Common => }/Arm/ArmLibSupport.S | 0 ArmPkg/Library/ArmLib/{Common => }/Arm/ArmLibSupport.asm | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmLibSupportV7.S | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmLibSupportV7.asm | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimer.c | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimerSupport.S | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimerSupport.asm | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Lib.c | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Lib.h | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Support.S | 0 ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Support.asm | 0 ArmPkg/Library/ArmLib/ArmBaseLib.inf | 24 ++++++++++---------- ArmPkg/Library/ArmLib/{Common => }/ArmLib.c | 0 ArmPkg/Library/ArmLib/{Common => }/ArmLibPrivate.h | 0 15 files changed, 12 insertions(+), 12 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S similarity index 100% rename from ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S rename to ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S similarity index 100% rename from ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm similarity index 100% rename from ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.S rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.asm similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.asm rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.asm diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c rename to ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h rename to ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S rename to ArmPkg/Library/ArmLib/Arm/ArmV7Support.S diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm similarity index 100% rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm rename to ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf index 3e9f19c3cab1..05a585343cda 100644 --- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -23,30 +23,30 @@ [Defines] LIBRARY_CLASS = ArmLib [Sources] - Common/ArmLib.c + ArmLib.c [Sources.ARM] - ArmV7/ArmV7Lib.c - ArmV7/ArmV7ArchTimer.c + Arm/ArmV7Lib.c + Arm/ArmV7ArchTimer.c - ArmV7/ArmLibSupportV7.S | GCC - ArmV7/ArmV7Support.S | GCC - ArmV7/ArmV7ArchTimerSupport.S | GCC - Common/Arm/ArmLibSupport.S | GCC + Arm/ArmLibSupport.S | GCC + Arm/ArmLibSupportV7.S | GCC + Arm/ArmV7Support.S | GCC + Arm/ArmV7ArchTimerSupport.S | GCC - ArmV7/ArmLibSupportV7.asm | RVCT - ArmV7/ArmV7Support.asm | RVCT - ArmV7/ArmV7ArchTimerSupport.asm | RVCT - Common/Arm/ArmLibSupport.asm | RVCT + Arm/ArmLibSupport.asm | RVCT + Arm/ArmLibSupportV7.asm | RVCT + Arm/ArmV7Support.asm | RVCT + Arm/ArmV7ArchTimerSupport.asm | RVCT [Sources.AARCH64] AArch64/AArch64Lib.c AArch64/AArch64ArchTimer.c + AArch64/ArmLibSupport.S AArch64/ArmLibSupportV8.S AArch64/AArch64Support.S AArch64/AArch64ArchTimerSupport.S - Common/AArch64/ArmLibSupport.S [Packages] ArmPkg/ArmPkg.dec diff --git a/ArmPkg/Library/ArmLib/Common/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c similarity index 100% rename from ArmPkg/Library/ArmLib/Common/ArmLib.c rename to ArmPkg/Library/ArmLib/ArmLib.c diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/ArmLibPrivate.h similarity index 100% rename from ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h rename to ArmPkg/Library/ArmLib/ArmLibPrivate.h