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

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>

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
index 055a0552999c1dd69e6a63ffa3089df704b7fc84..74169d86a168c60695aa0914fec2d9d1e4e4239f 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
@@ -38,7 +38,6 @@
   NetLib\r
   UefiDriverEntryPoint\r
   BaseMemoryLib\r
   NetLib\r
   UefiDriverEntryPoint\r
   BaseMemoryLib\r

-  ArmLib\r

   IoLib\r
   DevicePathLib\r
 \r
   IoLib\r
   DevicePathLib\r
 \r

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 8ad2a84c045c5698ec6260ff501d8e987347efdc..e6861cb59c5bcfb0dabe45147fb0314eebebf2f1 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -195,9 +195,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011\r
 \r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011\r
 \r

-  # ISP1761 USB OTG Controller\r
-  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT64|0x00000021\r
-\r

 [PcdsFixedAtBuild.IA32]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011\r
 [PcdsFixedAtBuild.IA32]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index 4a34e34843ad248b7666a0264b10e4803958f7cb..09b1899c9b24c8020ffe0ed38d50458dd376876c 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -266,24 +266,7 @@
 \r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
 \r
 \r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
 \r

-  # FDT installation\r
-  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {\r
-    <LibraryClasses>\r
-      # It depends on BdsLib that depends on TimerLib\r
-      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-  }\r
-\r
-  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf\r
-  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {\r
-    <LibraryClasses>\r
-      # It depends on BdsLib that depends on TimerLib\r
-      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-  }\r
-  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf\r
-  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf\r
-\r

   # Drivers\r
   # Drivers\r

-  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf\r

   EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf\r
   EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf\r
 \r
   EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf\r
   EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf\r
 \r


@@ -298,5 +281,25 @@
 \r
   EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf\r
 \r
 \r
   EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf\r
 \r

+[Components.ARM]\r
+  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf\r
+\r
+[Components.ARM, Components.AARCH64]\r
+  EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf\r
+  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {\r
+    <LibraryClasses>\r
+      # It depends on BdsLib that depends on TimerLib\r
+      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  }\r
+  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf\r
+  EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf\r
+\r
+  # FDT installation\r
+  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {\r
+    <LibraryClasses>\r
+      # It depends on BdsLib that depends on TimerLib\r
+      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  }\r
+\r

 [Components.IA32, Components.X64, Components.IPF, Components.ARM]\r
   EmbeddedPkg/GdbStub/GdbStub.inf\r
 [Components.IA32, Components.X64, Components.IPF, Components.ARM]\r
   EmbeddedPkg/GdbStub/GdbStub.inf\r