[edk2-devel] [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references

[Ard Biesheuvel]

On Mon, 10 Jun 2019 at 16:20, Ard Biesheuvel <ard.biesheuvel at linaro.org> wrote:
>
> Fix up all the path references to Omap35xxPkg itself, which have gone
> stale after the move into edk2-platforms.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>
> ---
>  Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf                                   | 2 +-
>  Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf                                     | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf                     | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf     | 8 ++++----
>  Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf | 7 +++----
>  Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf             | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf     | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf                 | 6 +++---
>  Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf                       | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf     | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf           | 2 +-
>  Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf                         | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf                     | 6 +++---
>  Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf                                | 2 +-
>  Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf                          | 4 ++--
>  Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf                             | 6 +++---
>  16 files changed, 35 insertions(+), 36 deletions(-)
>

Right after hitting send, i noticed that I missed
Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc, which needs
fixing up as well. It also refers to a driver which is not used
anywhere (MMCHSDxe/MMCHS.inf) so I suggest we just remove that
entirely. Cumulative diff follows.

diff --git a/Silicon/TexasInstruments/Omap35xxPkg/MMCHSDxe/MMCHS.c
b/Silicon/TexasInstruments/Omap35xxPkg/MMCHSDxe/MMCHS.c
deleted file mode 100644
index 099e37c4695a..000000000000
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/MMCHSDxe/MMCHS.inf
b/Silicon/TexasInstruments/Omap35xxPkg/MMCHSDxe/MMCHS.inf
deleted file mode 100644
index a759f5939412..000000000000
--- a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc
@@ -20,10 +20,8 @@ [Defines]
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Omap35xxPkg
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
-  DEFINE TARGET_HACK             = DEBUG
-

 [LibraryClasses.common]
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
@@ -43,8 +41,8 @@ [LibraryClasses.common]
   RealTimeClockLib|EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  OmapLib|Omap35xxPkg/Library/OmapLib/OmapLib.inf
-  OmapDmaLib|Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+  OmapLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
+  OmapDmaLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf

   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
@@ -57,7 +55,7 @@ [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf

-  TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+  TimerLib|Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf

 #
 # Assume everything is fixed at build
@@ -160,24 +158,23 @@ [PcdsFixedAtBuild.common]
 #
 ################################################################################
 [Components.common]
-  Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
-  Omap35xxPkg/Library/OmapLib/OmapLib.inf
-  Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
-
-  Omap35xxPkg/Flash/Flash.inf
-  Omap35xxPkg/MMCHSDxe/MMCHS.inf
-  Omap35xxPkg/SmbusDxe/Smbus.inf
-  Omap35xxPkg/Gpio/Gpio.inf
-  Omap35xxPkg/InterruptDxe/InterruptDxe.inf
-  Omap35xxPkg/TimerDxe/TimerDxe.inf
-  Omap35xxPkg/TPS65950Dxe/TPS65950.inf
-
-  Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
-  Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
-  Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
-  Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
-  Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
-  Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
-  Omap35xxPkg/PciEmulation/PciEmulation.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+
+  Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
+  Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
+  Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
+  Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
+  Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
+
+  Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
+  Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
+  Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42110): https://edk2.groups.io/g/devel/message/42110
Mute This Topic: https://groups.io/mt/32004761/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-