diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-26 17:00:11 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-26 17:00:11 +0000 |
| commit | 95650ceda8aad7e6009807be89dd90d3ba3d7022 (patch) | |
| tree | 94ef94c5ee776433904982b7fdbbd8451447bc6f | |
| parent | 50c5f187314c55735135d9c47025286d1c0bf1d5 (diff) | |
| download | edk2-95650ceda8aad7e6009807be89dd90d3ba3d7022.tar.gz edk2-95650ceda8aad7e6009807be89dd90d3ba3d7022.tar.bz2 edk2-95650ceda8aad7e6009807be89dd90d3ba3d7022.zip | |
ArmPlatform: Remove dummy padding to make the Reset Vector aligned on 32 bytes boundary
A dummy padding was added before the Reset Vectors to force the alignment on a
32 bytes boundary in XIP code.
The correct fix is to define the alignment in the FDF file.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11588 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/PrePeiCore/Exception.S | 3 | ||||
| -rw-r--r-- | ArmPlatformPkg/PrePeiCore/Exception.asm | 3 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Exception.S | 3 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Exception.asm | 3 |
7 files changed, 3 insertions, 15 deletions
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf index 6283dca118..2873c562a9 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf @@ -254,7 +254,7 @@ READ_LOCK_STATUS = TRUE [Rule.Common.SEC] FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { - TE TE Align = 8 |.efi + TE TE Align = 32 |.efi } [Rule.Common.PEI_CORE] diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf index 04b3fb7511..9b61e08c53 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf @@ -254,7 +254,7 @@ READ_LOCK_STATUS = TRUE [Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
- TE TE Align = 8 |.efi
+ TE TE Align = 32 |.efi
}
[Rule.Common.PEI_CORE]
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf index 7d26d16021..17d4734254 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf @@ -257,7 +257,7 @@ READ_LOCK_STATUS = TRUE [Rule.Common.SEC] FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { - TE TE Align = 8 |.efi + TE TE Align = 32 |.efi } [Rule.Common.PEI_CORE] diff --git a/ArmPlatformPkg/PrePeiCore/Exception.S b/ArmPlatformPkg/PrePeiCore/Exception.S index 618e0787b5..a7b4982c21 100644 --- a/ArmPlatformPkg/PrePeiCore/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/Exception.S @@ -29,9 +29,6 @@ GCC_ASM_EXPORT(PeiVectorTable) //Default Exception Handlers //============================================================ -//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. -Dummy1: .word 0
-Dummy2: .word 0
ASM_PFX(PeiVectorTable): b _DefaultResetHandler diff --git a/ArmPlatformPkg/PrePeiCore/Exception.asm b/ArmPlatformPkg/PrePeiCore/Exception.asm index d081c49564..16e0d9d14c 100644 --- a/ArmPlatformPkg/PrePeiCore/Exception.asm +++ b/ArmPlatformPkg/PrePeiCore/Exception.asm @@ -25,9 +25,6 @@ //Default Exception Handlers //============================================================ -//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. -Dummy1 DCD 0
-Dummy2 DCD 0
PeiVectorTable b _DefaultResetHandler diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S index 54d6104b81..4c7f780dbe 100644 --- a/ArmPlatformPkg/Sec/Exception.S +++ b/ArmPlatformPkg/Sec/Exception.S @@ -29,9 +29,6 @@ GCC_ASM_EXPORT(SecVectorTable) //Default Exception Handlers //============================================================ -//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. -Dummy1: .word 0 -Dummy2: .word 0 ASM_PFX(SecVectorTable): b _DefaultResetHandler diff --git a/ArmPlatformPkg/Sec/Exception.asm b/ArmPlatformPkg/Sec/Exception.asm index dcf2cf93b4..ef8629a897 100644 --- a/ArmPlatformPkg/Sec/Exception.asm +++ b/ArmPlatformPkg/Sec/Exception.asm @@ -25,9 +25,6 @@ //Default Exception Handlers //============================================================ -//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. -Dummy1 DCD 0
-Dummy2 DCD 0
SecVectorTable b _DefaultResetHandler |