Include the SnpDxe driver unconditionally: it is required for other network adapters than XGBE, so it is essentially part of the default stack.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 2 +- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index e535dedb2b58..a60e09682df4 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -650,12 +650,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf !endif
# # Networking stack # + MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index f723f0339581..6cb89d394010 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf !endif
# # Networking stack # + INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index bedc56077382..bbb6b9edcbaf 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -661,12 +661,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf !endif
# # Networking stack # + MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 064f2ec9a48e..d0fb9000e2a2 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf !endif
# # Networking stack # + INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
When building the firmware with PSCI support, only the primary core enters UEFI, and the secondaries remain under the control of the EL3 firmware until the moment the OS invokes PSCI methords to release them.
This means we can use the UP variant or PrePeiCore in this case.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 4 ++++ Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 4 ++++ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 4 ++++ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 ++++ 4 files changed, 16 insertions(+)
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index a60e09682df4..2e8cbffd80c9 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -547,7 +547,11 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # PEI Phase modules # +!if $(DO_PSCI) + ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif MdeModulePkg/Core/Pei/PeiMain.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf { <LibraryClasses> diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index 6cb89d394010..5543b08b2dc9 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -248,7 +248,11 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE
+!if $(DO_PSCI) + INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF AmdModulePkg/Iscp/IscpPei.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index bbb6b9edcbaf..e4ece5e23218 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -558,7 +558,11 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # PEI Phase modules # +!if $(DO_PSCI) + ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif MdeModulePkg/Core/Pei/PeiMain.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf { <LibraryClasses> diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index d0fb9000e2a2..263a267fbae7 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -247,7 +247,11 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE
+!if $(DO_PSCI) + INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF AmdModulePkg/Iscp/IscpPei.inf
The ARM PCI specific CpuIo2Dxe driver changed name and location between its first proposed version and the one that was finally merged. So use the permanent name.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 2 +- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index 2e8cbffd80c9..251c3a70c9ed 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -626,7 +626,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # PCI support # AmdModulePkg/Gionb/Gionb.inf - ArmPlatformPkg/Drivers/CpuIo2Dxe/ArmPciCpuIo2Dxe.inf + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index 5543b08b2dc9..c5a9065fb58d 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -144,7 +144,7 @@ READ_LOCK_STATUS = TRUE # PCI support # INF AmdModulePkg/Gionb/Gionb.inf - INF ArmPlatformPkg/Drivers/CpuIo2Dxe/ArmPciCpuIo2Dxe.inf + INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
On Fri, Apr 29, 2016 at 07:58:57PM +0200, Ard Biesheuvel wrote:
Include the SnpDxe driver unconditionally: it is required for other network adapters than XGBE, so it is essentially part of the default stack.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org
All good stuff. I'm happy for you to push the series to the -dev branch, if not already done.
Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 2 +- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index e535dedb2b58..a60e09682df4 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -650,12 +650,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif # # Networking stack #
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index f723f0339581..6cb89d394010 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif # # Networking stack #
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index bedc56077382..bbb6b9edcbaf 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -661,12 +661,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif # # Networking stack #
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 064f2ec9a48e..d0fb9000e2a2 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif # # Networking stack #
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-- 2.7.4
On 29 April 2016 at 20:02, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Apr 29, 2016 at 07:58:57PM +0200, Ard Biesheuvel wrote:
Include the SnpDxe driver unconditionally: it is required for other network adapters than XGBE, so it is essentially part of the default stack.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org
All good stuff. I'm happy for you to push the series to the -dev branch, if not already done.
OK pushed
Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 2 +- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index e535dedb2b58..a60e09682df4 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -650,12 +650,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif
# # Networking stack #
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index f723f0339581..6cb89d394010 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif
# # Networking stack #
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index bedc56077382..bbb6b9edcbaf 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -661,12 +661,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # AmdModulePkg/SnpDxe/SnpDxePort0.inf AmdModulePkg/SnpDxe/SnpDxePort1.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif
# # Networking stack #
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 064f2ec9a48e..d0fb9000e2a2 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -172,12 +172,12 @@ READ_LOCK_STATUS = TRUE # INF AmdModulePkg/SnpDxe/SnpDxePort0.inf INF AmdModulePkg/SnpDxe/SnpDxePort1.inf
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
!endif
# # Networking stack #
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-- 2.7.4
-
Ard Biesheuvel -
Leif Lindholm