From f107873651ae8e02ddc6858dc9a11149093e47a3 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 21 Nov 2016 12:19:54 +0000 Subject: [PATCH] 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 Reviewed-by: Ryan Harkin --- BeagleBoardPkg/BeagleBoardPkg.dsc | 12 ------------ BeagleBoardPkg/BeagleBoardPkg.fdf | 3 --- 2 files changed, 15 deletions(-) diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index 1e2ecdc21a..f40095ac45 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -369,14 +369,8 @@ # gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000 - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SD" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(B615F1F5-5088-43CD-809C-A16E52487D00)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=tty0 console=ttyS2,115200n8 root=UUID=a4af765b-c2b5-48f4-9564-7a4e9104c4f6 rootwait ro earlyprintk" gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10 - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - # GUID of the UEFI Shell gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } @@ -521,9 +515,3 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } - - # Legacy Linux Loader - ArmPkg/Application/LinuxLoader/LinuxLoader.inf { - - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - } diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf index fcaf44abb5..42e097f641 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.fdf +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf @@ -187,9 +187,6 @@ FvNameGuid = d0dd3e90-343d-4cb3-8f69-772214989282 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf - # Legacy Linux Loader - INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf - [FV.FVMAIN_COMPACT] FvAlignment = 8