[Linaro-uefi] Platforms/ARM/FVP: remove LinuxLoader from build

Message ID 1462178695-24368-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 012f784ca6c72f0c303d4f4c227f211c377af952
Headers show

Commit Message

Ard Biesheuvel May 2, 2016, 8:44 a.m.
The built-in Linux loader is broken in several ways, one of which is that
it shields the UEFI environment from the OS. So remove it from the FVP build.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 3 ---
 Platforms/ARM/VExpress/ArmVExpress.dsc.inc         | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

Comments

Ryan Harkin May 3, 2016, 12:05 p.m. | #1
On 2 May 2016 at 09:44, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> The built-in Linux loader is broken in several ways, one of which is that
> it shields the UEFI environment from the OS. So remove it from the FVP build.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>

Tested on TC2, Juno R0/1/2 and FVP Base AEMv8 and Foundation models.


> ---
>  Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 3 ---
>  Platforms/ARM/VExpress/ArmVExpress.dsc.inc         | 7 ++++---
>  2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> index 3bcdb1ca43f1..b49d452e85e5 100644
> --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> @@ -181,9 +181,6 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
>    }
>  !endif
>
> -  # Legacy Linux Loader
> -  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> -
>    # FV Filesystem
>    INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
>
> diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> index d898aef490f9..bfd94c3a2df4 100644
> --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> @@ -488,9 +488,6 @@
>    #
>    EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
>
> -  # Legacy Linux Loader
> -  ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> -
>    #
>    # UEFI application (Shell Embedded Boot Loader)
>    #
> @@ -509,3 +506,7 @@
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>        BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
>    }
> +
> +[Components.ARM]
> +  # Legacy Linux Loader
> +  ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> --
> 2.7.4
>
Leif Lindholm May 3, 2016, 3:02 p.m. | #2
On Tue, May 03, 2016 at 01:05:05PM +0100, Ryan Harkin wrote:
> On 2 May 2016 at 09:44, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> > The built-in Linux loader is broken in several ways, one of which is that
> > it shields the UEFI environment from the OS. So remove it from the FVP build.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
> Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
> 
> Tested on TC2, Juno R0/1/2 and FVP Base AEMv8 and Foundation models.

Pushed, thanks!

> 
> 
> > ---
> >  Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 3 ---
> >  Platforms/ARM/VExpress/ArmVExpress.dsc.inc         | 7 ++++---
> >  2 files changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> > index 3bcdb1ca43f1..b49d452e85e5 100644
> > --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> > +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> > @@ -181,9 +181,6 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
> >    }
> >  !endif
> >
> > -  # Legacy Linux Loader
> > -  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> > -
> >    # FV Filesystem
> >    INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
> >
> > diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> > index d898aef490f9..bfd94c3a2df4 100644
> > --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> > +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> > @@ -488,9 +488,6 @@
> >    #
> >    EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> >
> > -  # Legacy Linux Loader
> > -  ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> > -
> >    #
> >    # UEFI application (Shell Embedded Boot Loader)
> >    #
> > @@ -509,3 +506,7 @@
> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >        BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> >    }
> > +
> > +[Components.ARM]
> > +  # Legacy Linux Loader
> > +  ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> > --
> > 2.7.4
> >

Patch

diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
index 3bcdb1ca43f1..b49d452e85e5 100644
--- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
+++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
@@ -181,9 +181,6 @@  FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
   }
 !endif
 
-  # Legacy Linux Loader
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
-
   # FV Filesystem
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
 
diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
index d898aef490f9..bfd94c3a2df4 100644
--- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
+++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
@@ -488,9 +488,6 @@ 
   #
   EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
 
-  # Legacy Linux Loader
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf
-
   #
   # UEFI application (Shell Embedded Boot Loader)
   #
@@ -509,3 +506,7 @@ 
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
   }
+
+[Components.ARM]
+  # Legacy Linux Loader
+  ArmPkg/Application/LinuxLoader/LinuxLoader.inf