From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (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 640071A1E29 for ; Mon, 5 Sep 2016 04:06:23 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id 1so132792486wmz.1 for ; Mon, 05 Sep 2016 04:06:23 -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=kJwiZyfwGC3eSW+8KwNfKFC8DaZusxtOced2erf/FSw=; b=e3kZM+nbI3PFgVeEf+7KHH3dB1rso+GT7vuRgrZRNwIUfsz11/cmRlrxtN563Fcam0 1nVQwn+1f1QUPwrAoSbNKi3u6qK7PR63fcmexXTVF7us3mMhrCGF9Ll0SF0PK8geGSsA k92mK/dqKe6IEIRZyeRWK0sh3Lje6CdmTmqdk= 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=kJwiZyfwGC3eSW+8KwNfKFC8DaZusxtOced2erf/FSw=; b=M0plG+rOdwaMwSMsU4Gl/91/a14gUrvyaCwb3DhZgtgVuhXFP5lJyjodVcdwEqEKnI p4I1LnobvS9uPrKk+dyOFXhefdZJvWXYAoVKD+fcm4TpuUTI47zMsF/y3Wd5bOKaRUkj wS3SPQC2eXaTwtR00QZNTBt5AuMNQc7nmNls6HCfVxyKNYbCUDkVF5OhBs+Eg0ElPq/y gbCRKhArItNPIPcTI7656ZC6qGmm0CkZEeWhIgBc7AdkroZj+kAbzNckXoXH2LOZZZxN T/QtMPDCX7SwkWC5OsvUYZiwxwpnh7qrjuw26mJ8S9o1AB1uxlgmzfYFWrgipQi6aemv 7e+g== X-Gm-Message-State: AE9vXwMGJtkGygJLfSaCHbf+0TvGtiuFzUox3g/lq52Ca6WGUnujm/MRuG6CAT7vEOmMAnbt X-Received: by 10.194.94.225 with SMTP id df1mr6249397wjb.51.1473073582006; Mon, 05 Sep 2016 04:06:22 -0700 (PDT) Received: from localhost.localdomain ([197.130.133.164]) by smtp.gmail.com with ESMTPSA id cf1sm22442395wjc.29.2016.09.05.04.06.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 04:06:19 -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:05 +0100 Message-Id: <1473073566-1504-5-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 4/5] BeagleBoardPkg EmbeddedPkg Omap35xxPkg: move to 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:23 -0000 The various ArmLib flavors are identical in practice, and a new ArmBaseLib has been introduced that can replace all of them. So replace all occurrences with ArmBaseLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- BeagleBoardPkg/BeagleBoardPkg.dsc | 4 +--- EmbeddedPkg/EmbeddedPkg.dsc | 7 +------ Omap35xxPkg/Omap35xxPkg.dsc | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index b4a645ba9149..e4f229e3bf67 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -32,7 +32,7 @@ [Defines] [LibraryClasses.common] - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf @@ -132,8 +132,6 @@ [LibraryClasses.common] FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf [LibraryClasses.common.SEC] - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index a5507ed220d5..cd1f6df06b24 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -134,12 +134,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf -[LibraryClasses.ARM] - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf - -[LibraryClasses.AARCH64] - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf - + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ################################################################################ # diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc index f3366cabe8a1..11259191e1aa 100644 --- a/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Omap35xxPkg/Omap35xxPkg.dsc @@ -33,7 +33,7 @@ [Defines] [LibraryClasses.common] DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf -- 2.7.4