| Message ID | 1479726482-14355-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 028971707ed3fe327421c9cad7510ade574dc653 |
| Headers | show |
On 21 November 2016 at 11:08, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > Remove the LinuxLoader from the TC2 build, and along with it some related > PCD settings that are no longer used now that we switched to the generic > BDS. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Tested on FVP, TC2 and Juno R0/1/2. Tested-by: Ryan Harkin <ryan.harkin@linaro.org> I can review tomorrow if you want a Reviewed-by too. > --- > Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 14 -------------- > Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf | 3 --- > Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 7 ------- > 3 files changed, 24 deletions(-) > > diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > index b56e2885ac31..69048a3b1a88 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > @@ -177,20 +177,6 @@ > gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/ca15a7" > > # > - # ARM OS Loader > - # > - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash" > - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"Fv(73DCB643-3862-4904-9076-A94AF1890243)/LinuxLoader.efi" > - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/kernel -c \"console=ttyAMA0,38400 earlyprintk debug verbose\"" > - > - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) > - # PL111 - CLCD > - #gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)" > - # HDLCD > - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)" > - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()" > - > - # > # ARM Architectural Timer Frequency > # > !ifdef ARM_BIGLITTLE_TC2 > diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf > index 7f4f786644db..90746158351e 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf > +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf > @@ -182,9 +182,6 @@ FvNameGuid = 73dcb643-3862-4904-9076-a94af1890243 > SECTION RAW = MdeModulePkg/Logo/Logo.bmp > } > > - # 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 7558f5693f39..ddf617c850c8 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc > +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc > @@ -517,10 +517,3 @@ > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf > } > - > -[Components.ARM] > - # Legacy Linux Loader > - ArmPkg/Application/LinuxLoader/LinuxLoader.inf { > - <LibraryClasses> > - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > - } > -- > 2.7.4 >
On 21 November 2016 at 17:27, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 21 November 2016 at 11:08, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >> Remove the LinuxLoader from the TC2 build, and along with it some related >> PCD settings that are no longer used now that we switched to the generic >> BDS. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Tested on FVP, TC2 and Juno R0/1/2. > > Tested-by: Ryan Harkin <ryan.harkin@linaro.org> > > I can review tomorrow if you want a Reviewed-by too. > Thanks, and yes, please.
On 21 November 2016 at 17:28, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > On 21 November 2016 at 17:27, Ryan Harkin <ryan.harkin@linaro.org> wrote: >> On 21 November 2016 at 11:08, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >>> Remove the LinuxLoader from the TC2 build, and along with it some related >>> PCD settings that are no longer used now that we switched to the generic >>> BDS. >>> >>> Contributed-under: TianoCore Contribution Agreement 1.0 >>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> Tested on FVP, TC2 and Juno R0/1/2. >> >> Tested-by: Ryan Harkin <ryan.harkin@linaro.org> >> >> I can review tomorrow if you want a Reviewed-by too. >> > > Thanks, and yes, please. > Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org> > -- > Ard,
On 22 November 2016 at 17:03, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 21 November 2016 at 17:28, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >> On 21 November 2016 at 17:27, Ryan Harkin <ryan.harkin@linaro.org> wrote: >>> On 21 November 2016 at 11:08, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >>>> Remove the LinuxLoader from the TC2 build, and along with it some related >>>> PCD settings that are no longer used now that we switched to the generic >>>> BDS. >>>> >>>> Contributed-under: TianoCore Contribution Agreement 1.0 >>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >>> >>> Tested on FVP, TC2 and Juno R0/1/2. >>> >>> Tested-by: Ryan Harkin <ryan.harkin@linaro.org> >>> >>> I can review tomorrow if you want a Reviewed-by too. >>> >> >> Thanks, and yes, please. >> > > Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org> > Pushed, thanks.
diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc index b56e2885ac31..69048a3b1a88 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc @@ -177,20 +177,6 @@ gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/ca15a7" # - # ARM OS Loader - # - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"Fv(73DCB643-3862-4904-9076-A94AF1890243)/LinuxLoader.efi" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/kernel -c \"console=ttyAMA0,38400 earlyprintk debug verbose\"" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - # PL111 - CLCD - #gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)" - # HDLCD - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()" - - # # ARM Architectural Timer Frequency # !ifdef ARM_BIGLITTLE_TC2 diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf index 7f4f786644db..90746158351e 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf @@ -182,9 +182,6 @@ FvNameGuid = 73dcb643-3862-4904-9076-a94af1890243 SECTION RAW = MdeModulePkg/Logo/Logo.bmp } - # 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 7558f5693f39..ddf617c850c8 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -517,10 +517,3 @@ PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf } - -[Components.ARM] - # Legacy Linux Loader - ArmPkg/Application/LinuxLoader/LinuxLoader.inf { - <LibraryClasses> - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - }
Remove the LinuxLoader from the TC2 build, and along with it some related PCD settings that are no longer used now that we switched to the generic BDS. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 14 -------------- Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf | 3 --- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 7 ------- 3 files changed, 24 deletions(-)