diff mbox series

[edk2] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures

Message ID 20170830113533.7915-1-leif.lindholm@linaro.org
State Accepted
Commit 5202e6c907e5769ac8ecb024b7a07509bdba6181
Headers show
Series [edk2] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures | expand

Commit Message

Leif Lindholm Aug. 30, 2017, 11:35 a.m. UTC 
EmbeddedPkg should be architecture agnostic, but a few issues were
preventing other architectures to build individual components directly
from the .dsc:

- The AndroidBoot/AndroidFastBoot support have a dependency on BdsLib,
  which only has resolutions for ARM/AARCH64. Move them to an
  arch-restricted Components section.
- The Isp1761UsbDxe driver is not 64-bit compatible. It should be
  converted to UEFI driver model, but for now just move it to a new
  Components.ARM section. (Also delete non-useful declaration for
  AARCH64 in EmbeddedPkg.dec.)
- Lan9118Dxe has an unused ArmLib entry. Drop it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf |  1 -
 EmbeddedPkg/EmbeddedPkg.dec                   |  3 ---
 EmbeddedPkg/EmbeddedPkg.dsc                   | 37 +++++++++++++++------------
 3 files changed, 20 insertions(+), 21 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Aug. 30, 2017, 11:37 a.m. UTC | #1 
On 30 August 2017 at 12:35, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> EmbeddedPkg should be architecture agnostic, but a few issues were

> preventing other architectures to build individual components directly

> from the .dsc:

>

> - The AndroidBoot/AndroidFastBoot support have a dependency on BdsLib,

>   which only has resolutions for ARM/AARCH64. Move them to an

>   arch-restricted Components section.

> - The Isp1761UsbDxe driver is not 64-bit compatible. It should be

>   converted to UEFI driver model, but for now just move it to a new

>   Components.ARM section. (Also delete non-useful declaration for

>   AARCH64 in EmbeddedPkg.dec.)

> - Lan9118Dxe has an unused ArmLib entry. Drop it.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>  EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf |  1 -

>  EmbeddedPkg/EmbeddedPkg.dec                   |  3 ---

>  EmbeddedPkg/EmbeddedPkg.dsc                   | 37 +++++++++++++++------------

>  3 files changed, 20 insertions(+), 21 deletions(-)

>

> diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf

> index 055a055299..74169d86a1 100644

> --- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf

> +++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf

> @@ -38,7 +38,6 @@

>    NetLib

>    UefiDriverEntryPoint

>    BaseMemoryLib

> -  ArmLib

>    IoLib

>    DevicePathLib

>

> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec

> index ccdf38e36a..0be102ad9c 100644

> --- a/EmbeddedPkg/EmbeddedPkg.dec

> +++ b/EmbeddedPkg/EmbeddedPkg.dec

> @@ -195,9 +195,6 @@

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011

>

> -  # ISP1761 USB OTG Controller

> -  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT64|0x00000021

> -

>  [PcdsFixedAtBuild.IA32]

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011

> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc

> index 012721a332..d7ee6a3018 100644

> --- a/EmbeddedPkg/EmbeddedPkg.dsc

> +++ b/EmbeddedPkg/EmbeddedPkg.dsc

> @@ -267,24 +267,7 @@

>

>    EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf

>

> -  # FDT installation

> -  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {

> -    <LibraryClasses>

> -      # It depends on BdsLib that depends on TimerLib

> -      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

> -  }

> -

> -  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf

> -  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {

> -    <LibraryClasses>

> -      # It depends on BdsLib that depends on TimerLib

> -      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

> -  }

> -  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf

> -  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf

> -

>    # Drivers

> -  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf

>    EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf

>    EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf

>

> @@ -299,5 +282,25 @@

>

>    EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf

>

> +[Components.ARM]

> +  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf

> +

> +[Components.ARM, Components.AARCH64]

> +  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf

> +  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {

> +    <LibraryClasses>

> +      # It depends on BdsLib that depends on TimerLib

> +      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

> +  }

> +  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf

> +  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf

> +

> +  # FDT installation

> +  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {

> +    <LibraryClasses>

> +      # It depends on BdsLib that depends on TimerLib

> +      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

> +  }

> +

>  [Components.IA32, Components.X64, Components.IPF, Components.ARM]

>    EmbeddedPkg/GdbStub/GdbStub.inf

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Aug. 30, 2017, 11:50 a.m. UTC | #2 
On Wed, Aug 30, 2017 at 12:37:29PM +0100, Ard Biesheuvel wrote:
> On 30 August 2017 at 12:35, Leif Lindholm <leif.lindholm@linaro.org> wrote:

> > EmbeddedPkg should be architecture agnostic, but a few issues were

> > preventing other architectures to build individual components directly

> > from the .dsc:

> >

> > - The AndroidBoot/AndroidFastBoot support have a dependency on BdsLib,

> >   which only has resolutions for ARM/AARCH64. Move them to an

> >   arch-restricted Components section.

> > - The Isp1761UsbDxe driver is not 64-bit compatible. It should be

> >   converted to UEFI driver model, but for now just move it to a new

> >   Components.ARM section. (Also delete non-useful declaration for

> >   AARCH64 in EmbeddedPkg.dec.)

> > - Lan9118Dxe has an unused ArmLib entry. Drop it.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> 

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Thanks. Pushed as 5202e6c907.

/
    Leif
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox series

Patch

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
index 055a055299..74169d86a1 100644
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
@@ -38,7 +38,6 @@ 
   NetLib
   UefiDriverEntryPoint
   BaseMemoryLib
-  ArmLib
   IoLib
   DevicePathLib
 
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index ccdf38e36a..0be102ad9c 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -195,9 +195,6 @@ 
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011
 
-  # ISP1761 USB OTG Controller
-  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT64|0x00000021
-
 [PcdsFixedAtBuild.IA32]
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index 012721a332..d7ee6a3018 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -267,24 +267,7 @@ 
 
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
 
-  # FDT installation
-  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
-    <LibraryClasses>
-      # It depends on BdsLib that depends on TimerLib
-      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-  }
-
-  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
-  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {
-    <LibraryClasses>
-      # It depends on BdsLib that depends on TimerLib
-      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-  }
-  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf
-
   # Drivers
-  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
   EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
   EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
 
@@ -299,5 +282,25 @@ 
 
   EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
+[Components.ARM]
+  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+
+[Components.ARM, Components.AARCH64]
+  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
+  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {
+    <LibraryClasses>
+      # It depends on BdsLib that depends on TimerLib
+      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+  }
+  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
+  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf
+
+  # FDT installation
+  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
+    <LibraryClasses>
+      # It depends on BdsLib that depends on TimerLib
+      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+  }
+
 [Components.IA32, Components.X64, Components.IPF, Components.ARM]
   EmbeddedPkg/GdbStub/GdbStub.inf