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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 6283dca118567909cf5f6dae8726519ee143d79f..2873c562a97441ac4b3301bf39b980879d18ebff 100644 (file)
--- 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 04b3fb7511f85077449a330f887b2ea88ca4cee7..9b61e08c53104bb20e622d0d894ef02db4fac8bf 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -254,7 +254,7 @@ READ_LOCK_STATUS   = TRUE
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE    Align = 8      |.efi\r
+    TE  TE    Align = 32      |.efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 7d26d16021f3c93b4de5e2300153a30f05e577a5..17d473425424f54590ce6e5084158d152ba8296d 100644 (file)
--- 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 618e0787b5a37604405848aeacbfdce57a06617f..a7b4982c21823a8f6d23eed88c08d1ad0511085b 100644 (file)
--- 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\r
-Dummy2: .word      0\r
   
 ASM_PFX(PeiVectorTable):
   b _DefaultResetHandler

diff --git a/ArmPlatformPkg/PrePeiCore/Exception.asm b/ArmPlatformPkg/PrePeiCore/Exception.asm
index d081c49564d3364f1be766a9ab4790ee8a22ef2f..16e0d9d14c2bd1c14c979861d477315103a0c47d 100644 (file)
--- 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\r
-Dummy2        DCD      0\r
   
 PeiVectorTable
   b _DefaultResetHandler

diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index 54d6104b8155b2eda930b9ccca748341b5b7196f..4c7f780dbe3c7a02a57a22a72c98b35a56eb4c71 100644 (file)
--- 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 dcf2cf93b4513f57fa61736180c2975ba16bd923..ef8629a8975052cb164de08fb24ebfeb3ff9e562 100644 (file)
--- 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\r
-Dummy2        DCD      0\r
   
 SecVectorTable
   b _DefaultResetHandler