mirror of https://github.com/acidanthera/audk.git
ArmPlatformPkg: Remove Linux specific boot path
PcdDefaultBootType has been removed when the embedded Linux Loader has been removed from BdsLib. The boot arguments (defined by PcdDefaultBootArgument) are now always targetting EFI applications. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <Olivier.Martin@arm.com> Reviewed-by: Ronald Cron <Ronald.Cron@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17971 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
8b129b7b39
commit
a10c8f9e37
|
@ -151,7 +151,6 @@
|
|||
|
||||
# Support the Linux EFI stub by default
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0,115200 earlycon=pl011,0x7ff80000 root=/dev/sda1 rootwait verbose debug"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"
|
||||
|
|
|
@ -316,7 +316,6 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|827
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"Fv(14801114-DA6A-4113-985B-DC876337A15E)/LinuxLoader.efi"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/zImage-RTSM -a 827 -c \"console=ttyAMA0,38400n8\""
|
||||
|
|
|
@ -181,12 +181,9 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0,38400 earlyprintk debug verbose"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
# PL111 - CLCD
|
||||
|
|
|
@ -180,11 +180,8 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"NorFlash"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -177,8 +177,6 @@
|
|||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/filesystem.cpio.gz"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"
|
||||
# Use EFI Stub
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -157,11 +157,8 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -159,11 +159,8 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -160,12 +160,9 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"Fv(272E583C-B951-433F-AF42-A9C6862AF002)/LinuxLoader.efi"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/zImage -c \"console=ttyAMA0,38400n8\""
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -126,7 +126,6 @@
|
|||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"root=/dev/vda2 rw console=ttyAMA0 earlyprintk=pl011,0x1c090000 maxcpus=4 debug user_debug=31 loglevel=9"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();"
|
||||
|
|
|
@ -155,7 +155,6 @@
|
|||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"root=/dev/mmcblk0p2 console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
|
||||
|
|
|
@ -380,11 +380,8 @@
|
|||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|2272
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1
|
||||
|
||||
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"
|
||||
|
|
|
@ -362,18 +362,11 @@
|
|||
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"
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1
|
||||
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()"
|
||||
|
||||
#
|
||||
# ARM OS Loader
|
||||
#
|
||||
# BeagleBoard machine type (OMAP3_BEAGLE = 1546) required for ARM Linux:
|
||||
gArmTokenSpaceGuid.PcdArmMachineType|1546
|
||||
|
||||
################################################################################
|
||||
#
|
||||
# Components Section - list of all EDK II Modules needed by this Platform
|
||||
|
|
Loading…
Reference in New Issue