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 8E5441A1E29 for ; Mon, 5 Sep 2016 04:06:15 -0700 (PDT) Received: by mail-wm0-x235.google.com with SMTP id b187so14307227wme.1 for ; Mon, 05 Sep 2016 04:06:15 -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; bh=9dMubIvkbvYgMD6vD1dfO2EZa3ChEHvfGhcZD+V4B1U=; b=QkMfWKDswX1R0V+IVb8BwHS2wlrKgvLGAD9OAwNsc04lFeJE2Hz2Q8ATP/gAQlAXR9 ZsLPFvkptmBNVCbAqxiK2EYCAxEGRf4Z+8m6L3TrypVcJHmXImMSl4QWVKj3sikBFjYh UgY6/yPI0lUDLmR+dMOuUCDPztf9MLI/USGBQ= 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; bh=9dMubIvkbvYgMD6vD1dfO2EZa3ChEHvfGhcZD+V4B1U=; b=mZtZIY1RvD2gjCNahjjaa7hfX1ZleLXngMeTtqEcJfkclwPb9kZEfZITQwcxzPADoT 2iPS8xgrgoDQ3HPqIkzXvEZZmaZuvGTNned2OSvoW/EzgPuaA2iE2G8ir3JkKMrm0HeH TYuBvyGkJ3COeWtsiYQiX6X2FVqjBFruoM3yyH1KrfLGA6WKQlTk82iU6r9Xk4AnPH2J D9Fbt2btfvc7LhsaJCi7lHScjTdan0bXJCrQdKnT9OryNPM3NxAmbYLTujJ4qNc3TupM 26KFGPjqzlkXgtQMrCbHNUAL6pTpZtP72Ep9MUSr7pLHbkkuiHceapuaMe5Q9I3iWRTT OCEg== X-Gm-Message-State: AE9vXwNltPkm+MOl2eed7f5xEPL0f3XwsHk1ahSgrslm417YskWiq8cIt/fRfBJ5NN1j2Ugp X-Received: by 10.28.142.2 with SMTP id q2mr14069150wmd.119.1473073573900; Mon, 05 Sep 2016 04:06:13 -0700 (PDT) Received: from localhost.localdomain ([197.130.133.164]) by smtp.gmail.com with ESMTPSA id cf1sm22442395wjc.29.2016.09.05.04.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 04:06:13 -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:01 +0100 Message-Id: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [PATCH 0/5] ArmPkg ArmVirtPkg etc: consolidate ArmLib implementations 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:16 -0000 Now that the MMU manipulation routines have been moved out of ArmLib into ArmMmuLib, we are left with the following implementations of ArmLib which are all identical except for the fact that they target either ARM or AARCH64 but not both. ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf ArmPkg/Library/ArmLib/AArch64/AArch64LibPei.inf ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf So implement a new version 'ArmBaseLib' which does target both ARM and AARCH64, and replace all ArmLib references with ArmBaseLib. NOTE: this requires changes for existing out of tree users of ArmLib Ard Biesheuvel (5): ArmPkg/ArmLib: remove NullArmLib ArmPkg/ArmLib: introduce ArmBaseLib ArmVirtPkg: remove all ArmLib resolutions with ArmBaseLib BeagleBoardPkg EmbeddedPkg Omap35xxPkg: move to ArmBaseLib ArmPkg/ArmLib: remove all ArmLib flavors except ArmBaseLib ArmPkg/ArmPkg.dsc | 14 +-- ArmPkg/Library/ArmLib/AArch64/AArch64LibPei.inf | 43 ------- ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf | 44 -------- ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf | 40 ------- ArmPkg/Library/ArmLib/AArch64/AArch64PeiLibConstructor.c | 75 ------------- ArmPkg/Library/ArmLib/{AArch64/AArch64Lib.inf => ArmBaseLib.inf} | 39 +++++-- ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf | 52 --------- ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf | 52 --------- ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf | 44 -------- ArmPkg/Library/ArmLib/Null/NullArmLib.c | 117 -------------------- ArmPkg/Library/ArmLib/Null/NullArmLib.inf | 41 ------- ArmVirtPkg/ArmVirtQemu.dsc | 9 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 +- ArmVirtPkg/ArmVirtXen.dsc | 12 +- BeagleBoardPkg/BeagleBoardPkg.dsc | 4 +- EmbeddedPkg/EmbeddedPkg.dsc | 7 +- Omap35xxPkg/Omap35xxPkg.dsc | 2 +- 17 files changed, 36 insertions(+), 565 deletions(-) delete mode 100644 ArmPkg/Library/ArmLib/AArch64/AArch64LibPei.inf delete mode 100644 ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf delete mode 100644 ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf delete mode 100644 ArmPkg/Library/ArmLib/AArch64/AArch64PeiLibConstructor.c rename ArmPkg/Library/ArmLib/{AArch64/AArch64Lib.inf => ArmBaseLib.inf} (50%) delete mode 100644 ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf delete mode 100644 ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf delete mode 100644 ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf delete mode 100644 ArmPkg/Library/ArmLib/Null/NullArmLib.c delete mode 100644 ArmPkg/Library/ArmLib/Null/NullArmLib.inf -- 2.7.4