* [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures
@ 2017-08-30 11:35 Leif Lindholm
2017-08-30 11:37 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Leif Lindholm @ 2017-08-30 11:35 UTC (permalink / raw)
To: edk2-devel; +Cc: ard.biesheuvel
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures
2017-08-30 11:35 [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures Leif Lindholm
@ 2017-08-30 11:37 ` Ard Biesheuvel
2017-08-30 11:50 ` Leif Lindholm
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2017-08-30 11:37 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures
2017-08-30 11:37 ` Ard Biesheuvel
@ 2017-08-30 11:50 ` Leif Lindholm
0 siblings, 0 replies; 3+ messages in thread
From: Leif Lindholm @ 2017-08-30 11:50 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-30 11:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-30 11:35 [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures Leif Lindholm
2017-08-30 11:37 ` Ard Biesheuvel
2017-08-30 11:50 ` Leif Lindholm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox