X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=ArmPkg%2FInclude%2FAsmMacroIoLib.h;h=408b2ca28074fb46803ed9b53802297dc768164f;hb=3402aac7d985bf8a9f9d3c639f3fe93609380513;hp=c8692fcfd71e7cd70f3677ea17fee105d32cc3f7;hpb=17839a45b8748b88048774e2daefba4d0331678e;p=mirror_edk2.git

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index c8692fcfd7..408b2ca280 100644
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -120,13 +120,6 @@
   .long (_Data)           ;                 \
 1:
 
-// Convert the (ClusterId,CoreId) into a Core Position
-// We assume there are 4 cores per cluster
-#define GetCorePositionFromMpId(Pos, MpId, Tmp) \
-  lsr   Pos, MpId, #6 ;                        \
-  and   Tmp, MpId, #3 ;                        \
-  add   Pos, Pos, Tmp
-
 // Reserve a region at the top of the Primary Core stack
 // for Global variables for the XIP phase
 #define SetPrimaryStack(StackTop, GlobalSize, Tmp)  \
@@ -166,7 +159,7 @@ _InitializePrimaryStackEnd:
   ldr  r1, =Address ;              \
   ldr  r0, =Data    ;              \
   str  r0, [r1]
-    
+
 #define MmioOr32(Address, OrData) \
   ldr  r1, =Address ;             \
   ldr  r2, =OrData  ;             \
@@ -188,7 +181,7 @@ _InitializePrimaryStackEnd:
   and  r0, r0, r2   ;                             \
   ldr  r2, =OrData  ;                             \
   orr  r0, r0, r2   ;                             \
-  str  r0, [r1]         
+  str  r0, [r1]
 
 #define MmioWriteFromReg32(Address, Reg) \
   ldr  r1, =Address ;                    \
@@ -207,11 +200,6 @@ _InitializePrimaryStackEnd:
 
 #define LoadConstantToReg(Data, Reg) \
   ldr  Reg, =Data
-  
-#define GetCorePositionFromMpId(Pos, MpId, Tmp) \
-  lsr   Pos, MpId, #6 ;                        \
-  and   Tmp, MpId, #3 ;                        \
-  add   Pos, Pos, Tmp
 
 #define SetPrimaryStack(StackTop, GlobalSize, Tmp)  \
   and     Tmp, GlobalSize, #7         ;             \
@@ -247,7 +235,7 @@ _InitializePrimaryStackEnd:
 #else
 
 //
-// Use ARM assembly macros, form armasam 
+// Use ARM assembly macros, form armasam
 //
 //  Less magic in the macros if ldr reg, =expr works
 //
@@ -263,7 +251,7 @@ _InitializePrimaryStackEnd:
 
 // returns Data in R0 and Address in R1, and OrData in r2
 #define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData
-  
+
 
 // returns _Data in R0 and _Address in R1, and _OrData in r2
 
@@ -305,8 +293,6 @@ _InitializePrimaryStackEnd:
 // conditional load testing eq flag
 #define LoadConstantToRegIfEq(Data, Reg)  LoadConstantToRegIfEqMacro Data, Reg
 
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)  GetCorePositionFromMpId Pos, MpId, Tmp
-
 #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp
 
 // Initialize the Global Variable with '0'