diff options
author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-03-12 00:54:02 +0000 |
---|---|---|
committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-03-12 00:54:02 +0000 |
commit | a9d7090fc217dad23330ddc54cad4d4987cab65a (patch) | |
tree | 8d20f2d187e0b2322815ef0fafd6149490092239 /ArmPlatformPkg | |
parent | c63626b7d31cb8c6ffee5870de742f4aa859fee8 (diff) | |
download | edk2-a9d7090fc217dad23330ddc54cad4d4987cab65a.zip edk2-a9d7090fc217dad23330ddc54cad4d4987cab65a.tar.gz edk2-a9d7090fc217dad23330ddc54cad4d4987cab65a.tar.bz2 |
ArmPlatformPkg: 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@14182 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg')
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.S (renamed from ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.asm (renamed from ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf | 4 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.S (renamed from ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm (renamed from ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 6 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c | 3 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c (renamed from ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf | 4 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c | 62 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/Exception.S (renamed from ArmPlatformPkg/PrePeiCore/Exception.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/Exception.asm (renamed from ArmPlatformPkg/PrePeiCore/Exception.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S (renamed from ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm (renamed from ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S (renamed from ArmPlatformPkg/PrePeiCore/SwitchStack.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm (renamed from ArmPlatformPkg/PrePeiCore/SwitchStack.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 55 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 6 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 21 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 17 | ||||
-rw-r--r--[-rwxr-xr-x] | ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S (renamed from ArmPlatformPkg/PrePi/ModuleEntryPoint.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm (renamed from ArmPlatformPkg/PrePi/ModuleEntryPoint.asm) | 0 | ||||
-rwxr-xr-x | ArmPlatformPkg/PrePi/PeiMPCore.inf | 8 | ||||
-rwxr-xr-x | ArmPlatformPkg/PrePi/PeiUniCore.inf | 8 | ||||
-rw-r--r-- | ArmPlatformPkg/Sec/Arm/Helper.S (renamed from ArmPlatformPkg/Sec/Helper.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Sec/Arm/Helper.asm (renamed from ArmPlatformPkg/Sec/Helper.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Sec/Arm/SecEntryPoint.S (renamed from ArmPlatformPkg/Sec/SecEntryPoint.S) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm (renamed from ArmPlatformPkg/Sec/SecEntryPoint.asm) | 0 | ||||
-rw-r--r-- | ArmPlatformPkg/Sec/Sec.inf | 12 |
29 files changed, 123 insertions, 83 deletions
diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.S b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.S index a00fac4..a00fac4 100644 --- a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.S +++ b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.S diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.asm b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.asm index ead0868..ead0868 100644 --- a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.asm +++ b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.asm diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf index ba55ed5..f399547 100644 --- a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf +++ b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf @@ -33,8 +33,8 @@ ArmPlatformLibNullSec.c
[Sources.ARM]
- ArmPlatformLibNullBoot.asm | RVCT
- ArmPlatformLibNullBoot.S | GCC
+ Arm/ArmPlatformLibNullBoot.asm | RVCT
+ Arm/ArmPlatformLibNullBoot.S | GCC
[FixedPcd]
gArmTokenSpaceGuid.PcdFvBaseAddress
diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.S b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.S index 94660c9..94660c9 100644 --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.S +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.S diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.asm b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm index db92023..db92023 100644 --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.asm +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf index a41dae2..e48a658 100644 --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf @@ -26,9 +26,9 @@ ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
-[Sources.common]
- ArmPlatformStackLib.asm | RVCT
- ArmPlatformStackLib.S | GCC
+[Sources.ARM]
+ Arm/ArmPlatformStackLib.asm | RVCT
+ Arm/ArmPlatformStackLib.S | GCC
[FixedPcd]
gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c index e82584e..1f950d7 100644 --- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c +++ b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c @@ -30,8 +30,9 @@ ArmSecureMonitorWorldInitialize ( )
{
// Ensure the Monitor Table is 32bit aligned
- ASSERT (IS_ALIGNED(MonitorVectorTable, BIT5));
+ ASSERT (((UINTN)&MonitorVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
// Write the Monitor Mode Vector Table Address
ArmWriteMVBar ((UINTN) &MonitorVectorTable);
}
+
diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c b/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c index 138216e..138216e 100644 --- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c +++ b/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf index 9ddc9e8..33508c2 100644 --- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf +++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf @@ -29,9 +29,11 @@ [Sources.common]
EblCmdLib.c
- EblCmdMmu.c
EblCmdFdt.c
+[Sources.ARM]
+ Arm/EblCmdMmu.c
+
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
diff --git a/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c b/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c new file mode 100644 index 0000000..b0594ae --- /dev/null +++ b/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c @@ -0,0 +1,62 @@ +/** @file
+* Main file supporting the transition to PEI Core in Normal World for Versatile Express
+*
+* Copyright (c) 2012, ARM Limited. All rights reserved.
+*
+* This program and the accompanying materials
+* are licensed and made available under the terms and conditions of the BSD License
+* which accompanies this distribution. The full text of the license may be found at
+* http://opensource.org/licenses/bsd-license.php
+*
+* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+
+#include <Library/PrintLib.h>
+#include <Library/SerialPortLib.h>
+
+#include "PrePeiCore.h"
+
+VOID
+PeiCommonExceptionEntry (
+ IN UINT32 Entry,
+ IN UINTN LR
+ )
+{
+ CHAR8 Buffer[100];
+ UINTN CharCount;
+
+ switch (Entry) {
+ case 0:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reset Exception at 0x%X\n\r",LR);
+ break;
+ case 1:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Undefined Exception at 0x%X\n\r",LR);
+ break;
+ case 2:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"SWI Exception at 0x%X\n\r",LR);
+ break;
+ case 3:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"PrefetchAbort Exception at 0x%X\n\r",LR);
+ break;
+ case 4:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"DataAbort Exception at 0x%X\n\r",LR);
+ break;
+ case 5:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reserved Exception at 0x%X\n\r",LR);
+ break;
+ case 6:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"IRQ Exception at 0x%X\n\r",LR);
+ break;
+ case 7:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"FIQ Exception at 0x%X\n\r",LR);
+ break;
+ default:
+ CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Unknown Exception at 0x%X\n\r",LR);
+ break;
+ }
+ SerialPortWrite ((UINT8 *) Buffer, CharCount);
+ while(1);
+}
+
diff --git a/ArmPlatformPkg/PrePeiCore/Exception.S b/ArmPlatformPkg/PrePeiCore/Arm/Exception.S index abce21d..abce21d 100644 --- a/ArmPlatformPkg/PrePeiCore/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/Exception.S diff --git a/ArmPlatformPkg/PrePeiCore/Exception.asm b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm index 55bd4af..55bd4af 100644 --- a/ArmPlatformPkg/PrePeiCore/Exception.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S index f902a25..f902a25 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm index a3dd1fb..a3dd1fb 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm diff --git a/ArmPlatformPkg/PrePeiCore/SwitchStack.S b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S index 2543f58..2543f58 100644 --- a/ArmPlatformPkg/PrePeiCore/SwitchStack.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S diff --git a/ArmPlatformPkg/PrePeiCore/SwitchStack.asm b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm index 10da81d..10da81d 100644 --- a/ArmPlatformPkg/PrePeiCore/SwitchStack.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c index f1300e0..fdd8697 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c @@ -1,7 +1,7 @@ /** @file
* Main file supporting the transition to PEI Core in Normal World for Versatile Express
*
-* Copyright (c) 2011, ARM Limited. All rights reserved.
+* Copyright (c) 2011-2012, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -15,9 +15,7 @@ #include <Library/BaseLib.h>
#include <Library/DebugAgentLib.h>
-#include <Library/PrintLib.h>
#include <Library/ArmLib.h>
-#include <Library/SerialPortLib.h>
#include <Ppi/ArmGlobalVariable.h>
@@ -74,10 +72,10 @@ CEntryPoint ( )
{
//Clean Data cache
- ArmCleanInvalidateDataCache();
+ ArmCleanInvalidateDataCache ();
//Invalidate instruction cache
- ArmInvalidateInstructionCache();
+ ArmInvalidateInstructionCache ();
// Enable Instruction & Data caches
ArmEnableDataCache ();
@@ -88,9 +86,9 @@ CEntryPoint ( // as Non-secure interface is already enabled in Secure world.
//
- // Write VBAR - The Vector table must be 32-byte aligned
- ASSERT(((UINT32)PeiVectorTable & ((1 << 5)-1)) == 0);
- ArmWriteVBar((UINT32)PeiVectorTable);
+ // Write VBAR - The Exception Vector table must be aligned to its requirement
+ ASSERT (((UINTN)PeiVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
+ ArmWriteVBar ((UINTN)PeiVectorTable);
//Note: The MMU will be enabled by MemoryPeim. Only the primary core will have the MMU on.
@@ -162,44 +160,3 @@ PrePeiCoreGetGlobalVariableMemory ( return EFI_SUCCESS;
}
-VOID
-PeiCommonExceptionEntry (
- IN UINT32 Entry,
- IN UINT32 LR
- )
-{
- CHAR8 Buffer[100];
- UINTN CharCount;
-
- switch (Entry) {
- case 0:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reset Exception at 0x%X\n\r",LR);
- break;
- case 1:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Undefined Exception at 0x%X\n\r",LR);
- break;
- case 2:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"SWI Exception at 0x%X\n\r",LR);
- break;
- case 3:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"PrefetchAbort Exception at 0x%X\n\r",LR);
- break;
- case 4:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"DataAbort Exception at 0x%X\n\r",LR);
- break;
- case 5:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reserved Exception at 0x%X\n\r",LR);
- break;
- case 6:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"IRQ Exception at 0x%X\n\r",LR);
- break;
- case 7:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"FIQ Exception at 0x%X\n\r",LR);
- break;
- default:
- CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Unknown Exception at 0x%X\n\r",LR);
- break;
- }
- SerialPortWrite ((UINT8 *) Buffer, CharCount);
- while(1);
-}
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h index 9f7c9c3..20684e2 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h @@ -74,4 +74,10 @@ SecondaryMain ( IN UINTN MpId
);
+VOID
+PeiCommonExceptionEntry (
+ IN UINT32 Entry,
+ IN UINTN LR
+ );
+
#endif
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf index efdc4b7..91f9b3a 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -20,16 +20,19 @@ MODULE_TYPE = SEC
VERSION_STRING = 1.0
-[Sources.ARM]
- PrePeiCoreEntryPoint.asm | RVCT
- PrePeiCoreEntryPoint.S | GCC
- PrePeiCore.c
+[Sources.common]
MainMPCore.c
- SwitchStack.asm | RVCT
- SwitchStack.S | GCC
- Exception.asm | RVCT
- Exception.S | GCC
-
+ PrePeiCore.c
+
+[Sources.ARM]
+ Arm/ArchPrePeiCore.c
+ Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.S | GCC
+ Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.S | GCC
+ Arm/Exception.asm | RVCT
+ Arm/Exception.S | GCC
+
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf index 90582d8..bf590db 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -20,15 +20,18 @@ MODULE_TYPE = SEC
VERSION_STRING = 1.0
-[Sources.ARM]
- PrePeiCoreEntryPoint.asm | RVCT
- PrePeiCoreEntryPoint.S | GCC
+[Sources.common]
PrePeiCore.c
MainUniCore.c
- SwitchStack.asm | RVCT
- SwitchStack.S | GCC
- Exception.asm | RVCT
- Exception.S | GCC
+
+[Sources.ARM]
+ Arm/ArchPrePeiCore.c
+ Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.S | GCC
+ Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.S | GCC
+ Arm/Exception.asm | RVCT
+ Arm/Exception.S | GCC
[Packages]
MdePkg/MdePkg.dec
diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S index c0c20a9..c0c20a9 100755..100644 --- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm index 5efdb53..5efdb53 100644 --- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index f4cec0d..3a36141 100755 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -19,11 +19,13 @@ MODULE_TYPE = SEC
VERSION_STRING = 1.0
-[Sources.ARM]
+[Sources]
PrePi.c
- ModuleEntryPoint.S | GCC
- ModuleEntryPoint.asm | RVCT
MainMPCore.c
+
+[Sources.ARM]
+ Arm/ModuleEntryPoint.S | GCC
+ Arm/ModuleEntryPoint.asm | RVCT
[Packages]
MdePkg/MdePkg.dec
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf index 34a0686..823a956 100755 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -19,11 +19,13 @@ MODULE_TYPE = SEC
VERSION_STRING = 1.0
-[Sources.ARM]
+[Sources]
PrePi.c
- ModuleEntryPoint.S | GCC
- ModuleEntryPoint.asm | RVCT
MainUniCore.c
+
+[Sources.ARM]
+ Arm/ModuleEntryPoint.S | GCC
+ Arm/ModuleEntryPoint.asm | RVCT
[Packages]
MdePkg/MdePkg.dec
diff --git a/ArmPlatformPkg/Sec/Helper.S b/ArmPlatformPkg/Sec/Arm/Helper.S index 4eede5f..4eede5f 100644 --- a/ArmPlatformPkg/Sec/Helper.S +++ b/ArmPlatformPkg/Sec/Arm/Helper.S diff --git a/ArmPlatformPkg/Sec/Helper.asm b/ArmPlatformPkg/Sec/Arm/Helper.asm index b31cc31..b31cc31 100644 --- a/ArmPlatformPkg/Sec/Helper.asm +++ b/ArmPlatformPkg/Sec/Arm/Helper.asm diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S index 92035a1..92035a1 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm index 42d2b02..42d2b02 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.asm +++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf index 55ad007..3cf9f33 100644 --- a/ArmPlatformPkg/Sec/Sec.inf +++ b/ArmPlatformPkg/Sec/Sec.inf @@ -20,12 +20,14 @@ MODULE_TYPE = SEC
VERSION_STRING = 1.0
-[Sources.ARM]
- Helper.asm | RVCT
- Helper.S | GCC
+[Sources]
Sec.c
- SecEntryPoint.S | GCC
- SecEntryPoint.asm | RVCT
+
+[Sources.ARM]
+ Arm/Helper.asm | RVCT
+ Arm/Helper.S | GCC
+ Arm/SecEntryPoint.S | GCC
+ Arm/SecEntryPoint.asm | RVCT
[Packages]
MdePkg/MdePkg.dec
|