[Linaro-uefi,1/3] Platforms/AMD/Styx: include SnpDxe unconditionally

Message ID 1461952739-31629-1-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel April 29, 2016, 5:58 p.m.
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(-)

Comments

Leif Lindholm April 29, 2016, 6:02 p.m. | #1
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
>
Ard Biesheuvel April 29, 2016, 6:04 p.m. | #2
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
>>

Patch

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