From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) (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 CA8C41A1E2C for ; Mon, 5 Sep 2016 04:06:18 -0700 (PDT) Received: by mail-wm0-x235.google.com with SMTP id w12so34826190wmf.0 for ; Mon, 05 Sep 2016 04:06:18 -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=/A3W0QjcLJFkzTjLy8XHkh4CBWGQtIdbSgJSFcHL9d0=; b=WjfVW82i24kSjD5Tvo21fyjHA3Lt/cF3UrS0Uyq6ZJalYw6aC7yt3nuKQDiluIvaxH CDMvdyAhdZ/x6MiDxkIhZWkemAkBxU6KOyKqmspKdbC3OcmPUgM6VaAj+GgaVOBxIZwj j+3mXjPaIpWfNI/n6XSWW4pTvOz35/sBOQ2/A= 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=/A3W0QjcLJFkzTjLy8XHkh4CBWGQtIdbSgJSFcHL9d0=; b=GR/KcqcrTSUtvrNVfOeA+pDH5Yh/EmM1lfHaYZ+ZdPvlCixke9OhkDRwt/hw2bxF+0 Py6q2PvQW8kbkKfqnlZ1L2b0KT34FAeH6HMWfMYUsiUZXjovE9PwNGlKYqIbQ7F3+mso LF18qfoXvwea5WX9KxnflVAlbUQpad3aEfbCbLXLwkVs8rilwsxIND78p50Rffs2nLLC WD2ZVJOKwGrbZRs0VL1AAPVeafHKkURGKyjhcB1HPVjPELsruApLu7q9NCjF8ljd9il2 /Q4vlOCzbyI0avFbqODu+JXECiUXu8ysfxmZrvLe1K+U8rDVHqf4C71YmoXNpMWTixu7 aJog== X-Gm-Message-State: AE9vXwPQsZbslllJOpY6mDXaLNqYqcCZOzjalboCYxEec0KbHxZYUOP1euIjZoRSGWWeBL8J X-Received: by 10.194.95.36 with SMTP id dh4mr4993247wjb.156.1473073577391; Mon, 05 Sep 2016 04:06:17 -0700 (PDT) Received: from localhost.localdomain ([197.130.133.164]) by smtp.gmail.com with ESMTPSA id cf1sm22442395wjc.29.2016.09.05.04.06.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 04:06:16 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com Cc: Ard Biesheuvel Date: Mon, 5 Sep 2016 12:06:03 +0100 Message-Id: <1473073566-1504-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> References: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [PATCH 2/5] ArmPkg/ArmLib: introduce ArmBaseLib 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: , X-List-Received-Date: Mon, 05 Sep 2016 11:06:19 -0000 Introduce a new ArmLib version ArmBaseLib, which encapsulates the ARM version ArmV7Lib and the AArch64 version AArch64Lib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dsc | 1 + ArmPkg/Library/ArmLib/ArmBaseLib.inf | 62 ++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index e26ca035f555..012c5c835f4e 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -86,6 +86,7 @@ [LibraryClasses.common] IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf [LibraryClasses.ARM] diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf new file mode 100644 index 000000000000..670be4d836a5 --- /dev/null +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -0,0 +1,62 @@ +#/** @file +# +# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+# Portions copyright (c) 2011 - 2014, ARM Limited. All rights reserved. +# Copyright (c) 2016, Linaro Ltd. All rights reserved. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +# +#**/ + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = ArmBaseLib + FILE_GUID = f1d943b6-99c5-46d5-af5a-66ec67662700 + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = ArmLib + +[Sources] + Common/ArmLib.c + +[Sources.ARM] + ArmV7/ArmV7Lib.c + ArmV7/ArmV7ArchTimer.c + + ArmV7/ArmLibSupportV7.S | GCC + ArmV7/ArmV7Support.S | GCC + ArmV7/ArmV7ArchTimerSupport.S | GCC + Common/Arm/ArmLibSupport.S | GCC + + ArmV7/ArmLibSupportV7.asm | RVCT + ArmV7/ArmV7Support.asm | RVCT + ArmV7/ArmV7ArchTimerSupport.asm | RVCT + Common/Arm/ArmLibSupport.asm | RVCT + +[Sources.AARCH64] + AArch64/AArch64Lib.c + AArch64/AArch64ArchTimer.c + + AArch64/ArmLibSupportV8.S + AArch64/AArch64Support.S + AArch64/AArch64ArchTimerSupport.S + Common/AArch64/ArmLibSupport.S + +[Packages] + ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + MemoryAllocationLib + +[Protocols] + gEfiCpuArchProtocolGuid + +[FeaturePcd.ARM] + gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride -- 2.7.4