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

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to