UefiCpuPkg/ExceptionLib: Move global variable location

[mirror_edk2.git] / EmbeddedPkg / EmbeddedPkg.dsc

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index d3f8e7c507ffdd84f7123ea9d79056e7ae17ca44..a5507ed220d5c260097a92fb861c0d10855301c5 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -2,7 +2,7 @@
 # Embedded Package\r
 #\r
 #\r
-# Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
@@ -59,8 +59,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
   EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf\r
 \r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
 \r
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
@@ -70,7 +68,6 @@
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
 \r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
-  SerialPortExtLib|EmbeddedPkg/Library/TemplateSerialPortExtLib/TemplateSerialPortExtLib.inf\r
   RealTimeClockLib|EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf\r
   EfiResetSystemLib|EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf\r
   GdbSerialLib|EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf\r
@@ -251,8 +248,6 @@
   EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf\r
   EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf\r
   EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
-  MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
-  EmbeddedPkg/Library/SerialPortExtLibNull/SerialPortExtLibNull.inf\r
   EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf\r
   EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf\r
   EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.inf\r
@@ -263,22 +258,33 @@
   EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf\r
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
-  EmbeddedPkg/SerialDxe/SerialDxe.inf\r
   EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf\r
-  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
+  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf {\r
+    <LibraryClasses>\r
+      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  }\r
 \r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
 \r
   # FDT installation\r
-  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
-  EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf\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/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
   EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf\r
   EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf\r
+  EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf\r
 \r
 [Components.IA32, Components.X64, Components.IPF, Components.ARM]\r
   EmbeddedPkg/GdbStub/GdbStub.inf\r