From a9d7090fc217dad23330ddc54cad4d4987cab65a Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Tue, 12 Mar 2013 00:54:02 +0000 Subject: [PATCH] ArmPlatformPkg: Moved ARMv7 specific files to a 'Arm' subdirectory Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14182 6f19259b-4bc3-4df7-8a09-765794883524 --- .../{ => Arm}/ArmPlatformLibNullBoot.S | 0 .../{ => Arm}/ArmPlatformLibNullBoot.asm | 0 .../ArmPlatformLibNullSec.inf | 4 +- .../{ => Arm}/ArmPlatformStackLib.S | 0 .../{ => Arm}/ArmPlatformStackLib.asm | 0 .../ArmPlatformStackLib.inf | 6 +- .../ArmTrustedMonitorLibNull.c | 3 +- .../Library/EblCmdLib/{ => Arm}/EblCmdMmu.c | 0 .../Library/EblCmdLib/EblCmdLib.inf | 4 +- .../PrePeiCore/Arm/ArchPrePeiCore.c | 62 +++++++++++++++++++ .../PrePeiCore/{ => Arm}/Exception.S | 0 .../PrePeiCore/{ => Arm}/Exception.asm | 0 .../{ => Arm}/PrePeiCoreEntryPoint.S | 0 .../{ => Arm}/PrePeiCoreEntryPoint.asm | 0 .../PrePeiCore/{ => Arm}/SwitchStack.S | 0 .../PrePeiCore/{ => Arm}/SwitchStack.asm | 0 ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 55 ++-------------- ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 6 ++ .../PrePeiCore/PrePeiCoreMPCore.inf | 21 ++++--- .../PrePeiCore/PrePeiCoreUniCore.inf | 17 ++--- .../PrePi/{ => Arm}/ModuleEntryPoint.S | 0 .../PrePi/{ => Arm}/ModuleEntryPoint.asm | 0 ArmPlatformPkg/PrePi/PeiMPCore.inf | 8 ++- ArmPlatformPkg/PrePi/PeiUniCore.inf | 8 ++- ArmPlatformPkg/Sec/{ => Arm}/Helper.S | 0 ArmPlatformPkg/Sec/{ => Arm}/Helper.asm | 0 ArmPlatformPkg/Sec/{ => Arm}/SecEntryPoint.S | 0 .../Sec/{ => Arm}/SecEntryPoint.asm | 0 ArmPlatformPkg/Sec/Sec.inf | 12 ++-- 29 files changed, 123 insertions(+), 83 deletions(-) rename ArmPlatformPkg/Library/ArmPlatformSecLibNull/{ => Arm}/ArmPlatformLibNullBoot.S (100%) rename ArmPlatformPkg/Library/ArmPlatformSecLibNull/{ => Arm}/ArmPlatformLibNullBoot.asm (100%) rename ArmPlatformPkg/Library/ArmPlatformStackLib/{ => Arm}/ArmPlatformStackLib.S (100%) rename ArmPlatformPkg/Library/ArmPlatformStackLib/{ => Arm}/ArmPlatformStackLib.asm (100%) rename ArmPlatformPkg/Library/EblCmdLib/{ => Arm}/EblCmdMmu.c (100%) create mode 100644 ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c rename ArmPlatformPkg/PrePeiCore/{ => Arm}/Exception.S (100%) rename ArmPlatformPkg/PrePeiCore/{ => Arm}/Exception.asm (100%) rename ArmPlatformPkg/PrePeiCore/{ => Arm}/PrePeiCoreEntryPoint.S (100%) rename ArmPlatformPkg/PrePeiCore/{ => Arm}/PrePeiCoreEntryPoint.asm (100%) rename ArmPlatformPkg/PrePeiCore/{ => Arm}/SwitchStack.S (100%) rename ArmPlatformPkg/PrePeiCore/{ => Arm}/SwitchStack.asm (100%) rename ArmPlatformPkg/PrePi/{ => Arm}/ModuleEntryPoint.S (100%) mode change 100755 => 100644 rename ArmPlatformPkg/PrePi/{ => Arm}/ModuleEntryPoint.asm (100%) rename ArmPlatformPkg/Sec/{ => Arm}/Helper.S (100%) rename ArmPlatformPkg/Sec/{ => Arm}/Helper.asm (100%) rename ArmPlatformPkg/Sec/{ => Arm}/SecEntryPoint.S (100%) rename ArmPlatformPkg/Sec/{ => Arm}/SecEntryPoint.asm (100%) diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.S b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.S similarity index 100% rename from ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.S rename to ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.S diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.asm b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.asm similarity index 100% rename from ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullBoot.asm rename to ArmPlatformPkg/Library/ArmPlatformSecLibNull/Arm/ArmPlatformLibNullBoot.asm diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf index ba55ed5199..f399547574 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 similarity index 100% rename from ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.S rename to ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.S diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.asm b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm similarity index 100% rename from ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.asm rename to ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf index a41dae2b4f..e48a65801d 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 e82584e6dc..1f950d78f1 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 similarity index 100% rename from ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c rename to ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf index 9ddc9e82d1..33508c26ea 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 0000000000..b0594ae2cd --- /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 +#include + +#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 similarity index 100% rename from ArmPlatformPkg/PrePeiCore/Exception.S rename to ArmPlatformPkg/PrePeiCore/Arm/Exception.S diff --git a/ArmPlatformPkg/PrePeiCore/Exception.asm b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm similarity index 100% rename from ArmPlatformPkg/PrePeiCore/Exception.asm rename to ArmPlatformPkg/PrePeiCore/Arm/Exception.asm diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S similarity index 100% rename from ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S rename to ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm similarity index 100% rename from ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm rename to ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm diff --git a/ArmPlatformPkg/PrePeiCore/SwitchStack.S b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S similarity index 100% rename from ArmPlatformPkg/PrePeiCore/SwitchStack.S rename to ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S diff --git a/ArmPlatformPkg/PrePeiCore/SwitchStack.asm b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm similarity index 100% rename from ArmPlatformPkg/PrePeiCore/SwitchStack.asm rename to ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c index f1300e0e8c..fdd8697edf 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 #include -#include #include -#include #include @@ -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 9f7c9c3339..20684e2f90 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 efdc4b7544..91f9b3a784 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 90582d8922..bf590dbac0 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 old mode 100755 new mode 100644 similarity index 100% rename from ArmPlatformPkg/PrePi/ModuleEntryPoint.S rename to ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm similarity index 100% rename from ArmPlatformPkg/PrePi/ModuleEntryPoint.asm rename to ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index f4cec0d606..3a3614192a 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 34a068632b..823a956074 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 similarity index 100% rename from ArmPlatformPkg/Sec/Helper.S rename to ArmPlatformPkg/Sec/Arm/Helper.S diff --git a/ArmPlatformPkg/Sec/Helper.asm b/ArmPlatformPkg/Sec/Arm/Helper.asm similarity index 100% rename from ArmPlatformPkg/Sec/Helper.asm rename to ArmPlatformPkg/Sec/Arm/Helper.asm diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S similarity index 100% rename from ArmPlatformPkg/Sec/SecEntryPoint.S rename to ArmPlatformPkg/Sec/Arm/SecEntryPoint.S diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm similarity index 100% rename from ArmPlatformPkg/Sec/SecEntryPoint.asm rename to ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf index 55ad00744c..3cf9f339e0 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