ArmPkg: Moved ARMv7 specific files to a 'Arm' subdirectory

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14180 6f19259b-4bc3-4df7-8a09-765794883524

26 files changed, 41 insertions, 38 deletions

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
index 55a7132193..55a7132193 100644
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
diff --git a/ArmPkg/Drivers/CpuDxe/Mmu.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c
index dcc7b682c0..dcc7b682c0 100644
--- a/ArmPkg/Drivers/CpuDxe/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c
diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
index b471e4ac2f..16afd0452d 100644
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -40,8 +40,8 @@
 #

 

 [Sources.ARM]

-  Mmu.c

-  Exception.c

+  ArmV6/Mmu.c

+  ArmV6/Exception.c

   ArmV6/ExceptionSupport.asm | RVCT

   ArmV6/ExceptionSupport.S   | GCC

 

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf
index b28a4578b0..5f24ffaf3c 100644
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf
@@ -22,8 +22,8 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   Arm11Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf b/ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf
index cd36d8b3c7..7239aceaf9 100644
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf
@@ -22,8 +22,8 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   Arm11Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf b/ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf
index 4c3566e3c5..e693c46dc4 100644
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf
@@ -22,8 +22,8 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   Arm11Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
index 4eebf769dd..e962ca40aa 100644
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
@@ -22,8 +22,8 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

 

   Arm9Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
index e1900c5a11..4c57001930 100644
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
@@ -22,8 +22,8 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

 

   Arm9Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
index 2bc01a9949..ec2a0bae89 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
@@ -25,8 +25,8 @@
   ArmLibSupportV7.S    | GCC

   ArmLibSupportV7.asm  | RVCT

 

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   ArmV7Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
index 5fdb044974..be5b8e4930 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
@@ -25,8 +25,8 @@
   ArmLibSupportV7.S    | GCC

   ArmLibSupportV7.asm  | RVCT

 

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   ArmV7Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
index 9e6f17ec3e..c1f97bb12d 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
@@ -23,8 +23,8 @@
   ArmLibSupportV7.S    | GCC

   ArmLibSupportV7.asm  | RVCT

 

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

   

   ArmV7Support.S    | GCC

diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index b19185412c..b19185412c 100644
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index fd0f332bd6..fd0f332bd6 100644
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
index 33296204a8..d437198109 100644
--- a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
@@ -22,13 +22,15 @@
   LIBRARY_CLASS                  = ArmLib

 

 [Sources.common]

-  ../Common/ArmLibSupport.S    | GCC

-  ../Common/ArmLibSupport.asm  | RVCT

   ../Common/ArmLib.c

 

   NullArmLib.c

   NullArmCacheInformation.c

 

+[Sources.ARM]

+  ../Common/Arm/ArmLibSupport.S    | GCC

+  ../Common/Arm/ArmLibSupport.asm  | RVCT

+

 [Packages]

   ArmPkg/ArmPkg.dec

   MdePkg/MdePkg.dec

diff --git a/ArmPkg/Library/BdsLib/BdsLinuxAtag.c b/ArmPkg/Library/BdsLib/Arm/BdsLinuxAtag.c
index 8946b14236..8946b14236 100644
--- a/ArmPkg/Library/BdsLib/BdsLinuxAtag.c
+++ b/ArmPkg/Library/BdsLib/Arm/BdsLinuxAtag.c
diff --git a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c b/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c
index e3249e1307..e3249e1307 100644
--- a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c
+++ b/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c
diff --git a/ArmPkg/Library/BdsLib/BdsLib.inf b/ArmPkg/Library/BdsLib/BdsLib.inf
index d9439d983a..7f8b03eb59 100644
--- a/ArmPkg/Library/BdsLib/BdsLib.inf
+++ b/ArmPkg/Library/BdsLib/BdsLib.inf
@@ -25,11 +25,12 @@
   BdsAppLoader.c

   BdsHelper.c

   BdsLoadOption.c

-

-  BdsLinuxLoader.c

-  BdsLinuxAtag.c

   BdsLinuxFdt.c

 

+[Sources.ARM]

+  Arm/BdsLinuxLoader.c

+  Arm/BdsLinuxAtag.c

+

 [Packages]

   MdePkg/MdePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentException.S b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
index d92acfeacb..d92acfeacb 100644
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentException.S
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentException.asm b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.asm
index f281c0603f..f281c0603f 100644
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentException.asm
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.asm
diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
index 1cf0b33524..f6a0ec2938 100644
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
@@ -21,9 +21,11 @@
 

 [Sources.common]

   DebugAgentSymbolsBaseLib.c

-  DebugAgentException.asm        | RVCT

-  DebugAgentException.S          | GCC

-  

+

+[Sources.ARM]

+  Arm/DebugAgentException.asm        | RVCT

+  Arm/DebugAgentException.S          | GCC

+

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
index bb29b95da2..bb29b95da2 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
index 120e2de217..61dabf484e 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -21,11 +21,12 @@
   LIBRARY_CLASS                  = DefaultExceptionHandlerLib

   CONSTRUCTOR                    = DefaultExceptionHandlerConstructor

 

-

 [Sources.common]

-  DefaultExceptionHandler.c

   DefaultExceptionHandlerUefi.c

 

+[Sources.ARM]

+  Arm/DefaultExceptionHandler.c

+

 [Packages]

   MdePkg/MdePkg.dec

   ArmPkg/ArmPkg.dec

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf
index f51d3a0ef5..39b2775fce 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf
@@ -21,9 +21,11 @@
   LIBRARY_CLASS                  = DefaultExceptionHandlerLib

 

 [Sources.common]

-  DefaultExceptionHandler.c

   DefaultExceptionHandlerBase.c

 

+[Sources.ARM]

+  Arm/DefaultExceptionHandler.c

+

 [Packages]

   MdePkg/MdePkg.dec

   ArmPkg/ArmPkg.dec

diff --git a/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index 01b6dc334d..01b6dc334d 100644
--- a/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.inf b/ArmPkg/Library/SemihostLib/SemihostLib.inf
index 5ec7fef3a6..a0a6871780 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.inf
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.inf
@@ -27,10 +27,11 @@
 #

 #  VALID_ARCHITECTURES           = ARM

 #

+[Sources.common]

+  SemihostLib.c

+

 [Sources.ARM]

   Arm/GccSemihost.S | GCC

-  Arm/SemihostLib.c

-

 

 [Packages]

   MdePkg/MdePkg.dec

@@ -38,10 +39,4 @@
 

 [LibraryClasses]

   BaseLib

-  

-[Protocols]

-  

-[Guids]

- 

-[Pcd]

- 
\ No newline at end of file
+ 


diff --git a/ArmPkg/Library/SemihostLib/Arm/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 02836ca281..02836ca281 100644
--- a/ArmPkg/Library/SemihostLib/Arm/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h