| Message ID | 1507568462-28775-12-git-send-email-mw@semihalf.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Mon, Oct 09, 2017 at 07:01:00PM +0200, Marcin Wojtas wrote: > From: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > The FDFs no longer require explicit alignment for sections containing > aligned objects, so change it to 'Auto' and FIXED (which allows some > padding to be removed), and remove some other cruft while at it. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Signed-off-by: Marcin Wojtas <mw@semihalf.com> > --- > Platform/Marvell/Armada/Armada70x0.fdf | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf > index 2c3efe0..15ae52b 100644 > --- a/Platform/Marvell/Armada/Armada70x0.fdf > +++ b/Platform/Marvell/Armada/Armada70x0.fdf > @@ -235,16 +235,9 @@ READ_LOCK_STATUS = TRUE > # > ############################################################################ > > -[Rule.ARM.SEC] > - FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { > - TE TE Align = 32 $(INF_OUTPUT)/$(MODULE_NAME).efi > - } > - > -# The AArch64 Vector Table requires a 2K alignment that is not supported by the FDF specification. > -# It is the reason 4K is used instead of 2K for the module alignment. > [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 This does appear to arbitrarily increase indentation of the last entry on the line by 2, shifting it out of alignment with later entries in the file? / Leif > } > > [Rule.Common.PEI_CORE] > -- > 1.8.3.1 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
2017-10-10 16:58 GMT+02:00 Leif Lindholm <leif.lindholm@linaro.org>: > On Mon, Oct 09, 2017 at 07:01:00PM +0200, Marcin Wojtas wrote: >> From: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> The FDFs no longer require explicit alignment for sections containing >> aligned objects, so change it to 'Auto' and FIXED (which allows some >> padding to be removed), and remove some other cruft while at it. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> Signed-off-by: Marcin Wojtas <mw@semihalf.com> >> --- >> Platform/Marvell/Armada/Armada70x0.fdf | 11 ++--------- >> 1 file changed, 2 insertions(+), 9 deletions(-) >> >> diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf >> index 2c3efe0..15ae52b 100644 >> --- a/Platform/Marvell/Armada/Armada70x0.fdf >> +++ b/Platform/Marvell/Armada/Armada70x0.fdf >> @@ -235,16 +235,9 @@ READ_LOCK_STATUS = TRUE >> # >> ############################################################################ >> >> -[Rule.ARM.SEC] >> - FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { >> - TE TE Align = 32 $(INF_OUTPUT)/$(MODULE_NAME).efi >> - } >> - >> -# The AArch64 Vector Table requires a 2K alignment that is not supported by the FDF specification. >> -# It is the reason 4K is used instead of 2K for the module alignment. >> [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 > > This does appear to arbitrarily increase indentation of the last entry > on the line by 2, shifting it out of alignment with later entries in > the file? > I'll correct indentation in v2. Thanks, Marcin > / > Leif > >> } >> >> [Rule.Common.PEI_CORE] >> -- >> 1.8.3.1 >> _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf index 2c3efe0..15ae52b 100644 --- a/Platform/Marvell/Armada/Armada70x0.fdf +++ b/Platform/Marvell/Armada/Armada70x0.fdf @@ -235,16 +235,9 @@ READ_LOCK_STATUS = TRUE # ############################################################################ -[Rule.ARM.SEC] - FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED { - TE TE Align = 32 $(INF_OUTPUT)/$(MODULE_NAME).efi - } - -# The AArch64 Vector Table requires a 2K alignment that is not supported by the FDF specification. -# It is the reason 4K is used instead of 2K for the module alignment. [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 } [Rule.Common.PEI_CORE]