BeagleBoardPkg/BeagleBoardPkg.dsc: remove the LinuxLoader application

The LinuxLoader should no longer be used now that both the ARM and arm64
kernels as well as GRUB have full support for acting as an OS loader in
the UEFI spec sense. So remove it from the Beagle 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>

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 1e2ecdc21ad948506a4e2de9c10fb8bdd1199b25..f40095ac456bf2140455650822823d58ac8cddeb 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -369,14 +369,8 @@
   #\r
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SD"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(B615F1F5-5088-43CD-809C-A16E52487D00)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/Image"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=tty0 console=ttyS2,115200n8 root=UUID=a4af765b-c2b5-48f4-9564-7a4e9104c4f6 rootwait ro earlyprintk"\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"\r
-\r
   # GUID of the UEFI Shell\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
 \r
@@ -521,9 +515,3 @@
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
       gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
   }\r
-\r
-  # Legacy Linux Loader\r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
-    <LibraryClasses>\r
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
-  }\r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index fcaf44abb5cfa5fa63852df233c9787c9fcb42b2..42e097f641183f7c7ce977fa367b020d4809b685 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -187,9 +187,6 @@ FvNameGuid         = d0dd3e90-343d-4cb3-8f69-772214989282
   INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
   INF MdeModulePkg/Application/UiApp/UiApp.inf\r
 \r
-  # Legacy Linux Loader\r
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
-\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 8\r