X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPkg%2FInclude%2FAsmMacroIoLib.h;h=dac2e150cc88bc468ab3a560abfa10f9b6769ae2;hp=c5073297417568a7ced154547a70fbb4cf31ffc0;hb=2d45f194d98a1ff4f7d78b96a551d903969262b4;hpb=d05ca26cb891d8491641c378db4b0a0fcfc599d1

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index c507329741..dac2e150cc 100644
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -120,16 +120,6 @@
   .long (_Data)           ;                 \
 1:
 
-// Convert the (ClusterId,CoreId) into a Core Position
-// We assume there are 4 cores per cluster
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)  \
-  ldr   Tmp, =0xFFFF                             \
-  and   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)  \
@@ -211,16 +201,6 @@ _InitializePrimaryStackEnd:
 #define LoadConstantToReg(Data, Reg) \
   ldr  Reg, =Data
 
-// Convert the (ClusterId,CoreId) into a Core Position
-// We assume there are 4 cores per cluster
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)    \
-  ldr   Tmp, =0xFFFF ;                             \
-  and   MpId, Tmp ;                                \
-  lsr   Pos, MpId, #6 ;                            \
-  and   Tmp, MpId, #3 ;                            \
-  add   Pos, Pos, Tmp
-
 #define SetPrimaryStack(StackTop, GlobalSize, Tmp)  \
   and     Tmp, GlobalSize, #7         ;             \
   rsbne   Tmp, Tmp, #8                ;             \
@@ -313,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'