From 750db7903ee2a719659ab7bec9f53a72c5048dfc Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 10 Aug 2015 07:55:03 +0000 Subject: ArmPlatformPkg/ArmJunoPkg: use TE 'auto' alignment for SEC modules No need to hardcode the TE alignment anymore, now that GenFw sets the PE/COFF alignment according to the alignment requirements of the ELF input sections. Also enable FIXED FFS placement so that we can reclaim some of the space wasted to padding when using clang with 4 KB section alignment. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm Tested-by: Leif Lindholm git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18195 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf index 0012efcef5..c8f5831093 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf @@ -276,8 +276,8 @@ READ_LOCK_STATUS = TRUE } [Rule.AARCH64.SEC] - FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { - TE TE Align = 4K $(INF_OUTPUT)/$(MODULE_NAME).efi + FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED { + TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi } # A shim specific rule is required to ensure the alignment is 4K. @@ -288,13 +288,13 @@ READ_LOCK_STATUS = TRUE } [Rule.Common.PEI_CORE] - FILE PEI_CORE = $(NAMED_GUID) { + FILE PEI_CORE = $(NAMED_GUID) FIXED { TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING ="$(MODULE_NAME)" Optional } [Rule.Common.PEIM] - FILE PEIM = $(NAMED_GUID) { + FILE PEIM = $(NAMED_GUID) FIXED { PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional -- cgit v1.2.3