* [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
@ 2019-06-10 14:20 ` Ard Biesheuvel
2019-06-10 14:30 ` Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 2/5] Platform/BeagleBoard: fix path references in .inf files Ard Biesheuvel
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:20 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
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@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(-)
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf b/Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
index 39e36ec9ce48..7f741fe10e0e 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
@@ -20,7 +20,7 @@ [Sources.common]
[Packages]
MdePkg/MdePkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
PcdLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf b/Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
index 16850a3e6659..c0410a340a17 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
@@ -19,9 +19,9 @@ [Sources.common]
Gpio.c
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
IoLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
index 2a956c276729..abc5b84c9375 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
@@ -23,9 +23,9 @@ [Sources.common]
[Packages]
ArmPkg/ArmPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
BaseLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
index b017d8bf9258..65624ce7e189 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
@@ -18,12 +18,12 @@ [Sources.common]
LcdGraphicsOutputBlt.c
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ ArmPkg/ArmPkg.dec
EmbeddedPkg/EmbeddedPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
ArmLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
index ee178e7bd26b..74c03eab7828 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
@@ -24,11 +24,10 @@ [Sources.common]
[Packages]
- MdePkg/MdePkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
ArmPkg/ArmPkg.dec
-
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
BaseLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
index c372e35c5581..d13744f5875f 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
@@ -21,9 +21,9 @@ [Sources.common]
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
index ddb95c6542cb..0ef4ecdbca0d 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
@@ -24,9 +24,9 @@ [Sources.common]
TimerLib.c
[Packages]
- Omap35xxPkg/Omap35xxPkg.dec
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
index 68a0606cdfc3..d92a95cb0d09 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
@@ -18,10 +18,10 @@ [Sources.common]
OmapDmaLib.c
[Packages]
- MdePkg/MdePkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
ArmPkg/ArmPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
index df3738762278..ca0554b7407f 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
@@ -17,9 +17,9 @@ [Sources.common]
OmapLib.c
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
index 85c914796bce..876546e1c198 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
@@ -15,9 +15,9 @@ [Sources.common]
RealTimeClockLib.c
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
IoLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
index 086ed3c2a985..a4946059556f 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
@@ -33,7 +33,7 @@ [LibraryClasses]
[Packages]
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[FixedPcd]
gOmap35xxTokenSpaceGuid.PcdOmap35xxConsoleUart
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
index 88407211a57f..28e78ee646cd 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
@@ -17,9 +17,9 @@ [Sources.common]
MmcHostDxe.c
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
PcdLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf b/Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf
index 2e8e258985dc..666923acf717 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf
@@ -20,10 +20,10 @@ [Sources.common]
PciEmulation.c
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
BaseLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf b/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
index 0a3f4240ba9e..488116e5007f 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
@@ -19,7 +19,7 @@ [Sources.common]
[Packages]
MdePkg/MdePkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
PcdLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf b/Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
index e37d0a0f52a7..907d67b21790 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
@@ -19,9 +19,9 @@ [Sources.common]
TPS65950.c
[Packages]
- MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
BaseMemoryLib
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
index e072982d5143..c96ad42957c0 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
@@ -20,10 +20,10 @@ [Sources.common]
Timer.c
[Packages]
- Omap35xxPkg/Omap35xxPkg.dec
- MdePkg/MdePkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
ArmPkg/ArmPkg.dec
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
BaseLib
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references
2019-06-10 14:20 ` [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references Ard Biesheuvel
@ 2019-06-10 14:30 ` Ard Biesheuvel
0 siblings, 0 replies; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:30 UTC (permalink / raw)
To: edk2-devel-groups-io; +Cc: Leif Lindholm
On Mon, 10 Jun 2019 at 16:20, Ard Biesheuvel <ard.biesheuvel@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@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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH edk2-platforms 2/5] Platform/BeagleBoard: fix path references in .inf files
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references Ard Biesheuvel
@ 2019-06-10 14:20 ` Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 3/5] Platform/BeagleBoard: fix platform build Ard Biesheuvel
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:20 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
Fix up all the path references to Omap35xxPkg and BeagleBoardPkg itself,
which have gone stale after the move into edk2-platforms.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf | 12 ++++++------
Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
index 53f75a3ccc7e..6584323ccc86 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
+++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
@@ -15,13 +15,13 @@ [Defines]
LIBRARY_CLASS = ArmPlatformLib
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
- ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
- BeagleBoardPkg/BeagleBoardPkg.dec
+ ArmPkg/ArmPkg.dec
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+ Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[LibraryClasses]
IoLib
diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
index 3f50b21c1887..03a94e0a1a05 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -25,7 +25,7 @@ [Packages]
ArmPkg/ArmPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
+ Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec
[Pcd.common]
gArmTokenSpaceGuid.PcdCpuResetAddress
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH edk2-platforms 3/5] Platform/BeagleBoard: fix platform build
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 2/5] Platform/BeagleBoard: fix path references in .inf files Ard Biesheuvel
@ 2019-06-10 14:20 ` Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 4/5] Platform/RDKQemu: " Ard Biesheuvel
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:20 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
Fix the various issues that exist in the DSC/FDF descriptions of
BeagleBoard. Since the platform does not currently build, bisect
is not an issue, and so the following changes are applied together:
- fix path references to Omap35xxPkg and BeagleBoardPkg, which are
no longer valid after the move to edk2-platforms,
- fix DxeNetLib reference, and move it into the <LibraryClasses> scope
of the only two .INFs that use it,
- add the NOOPT build target,
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 54 ++++++++++----------
Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 22 ++++----
2 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index 2d5d6f9977ed..4ea9f541d51e 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -21,15 +21,15 @@ [Defines]
DSC_SPECIFICATION = 0x00010005
OUTPUT_DIRECTORY = Build/BeagleBoard
SUPPORTED_ARCHITECTURES = ARM
- BUILD_TARGETS = DEBUG|RELEASE
+ BUILD_TARGETS = DEBUG|RELEASE|NOOPT
SKUID_IDENTIFIER = DEFAULT
- FLASH_DEFINITION = BeagleBoardPkg/BeagleBoardPkg.fdf
+ FLASH_DEFINITION = Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
- ArmPlatformLib|BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
+ ArmPlatformLib|Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -48,7 +48,7 @@ [LibraryClasses.common]
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
- ResetSystemLib|BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
+ ResetSystemLib|Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -77,10 +77,10 @@ [LibraryClasses.common]
CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
- SerialPortLib|Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
+ SerialPortLib|Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
- RealTimeClockLib|Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
+ RealTimeClockLib|Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -106,17 +106,16 @@ [LibraryClasses.common]
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
- TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
- OmapLib|Omap35xxPkg/Library/OmapLib/OmapLib.inf
- OmapDmaLib|Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
- DebugAgentTimerLib|Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+ TimerLib|Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+ OmapLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf
+ OmapDmaLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+ DebugAgentTimerLib|Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
- GdbSerialLib|Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
+ GdbSerialLib|Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -150,7 +149,7 @@ [LibraryClasses.common.SEC]
MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf
PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
- MemoryInitPeiLib|BeagleBoardPkg/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
+ MemoryInitPeiLib|Platform/BeagleBoard/BeagleBoardPkg/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
# 1/123 faster than Stm or Vstm version
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -167,7 +166,7 @@ [LibraryClasses.common.DXE_CORE]
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
# PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
- PeCoffLib|BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
+ PeCoffLib|Platform/BeagleBoard/BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -196,7 +195,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
# PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
- PeCoffLib|BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
+ PeCoffLib|Platform/BeagleBoard/BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
[LibraryClasses.ARM]
@@ -357,7 +356,7 @@ [Components.common]
#
# SEC
#
- BeagleBoardPkg/PrePi/PeiUniCore.inf {
+ Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf {
<LibraryClasses>
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
}
@@ -369,7 +368,7 @@ [Components.common]
<LibraryClasses>
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
- NULL|BeagleBoardPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.inf
+ NULL|Platform/BeagleBoard/BeagleBoardPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.inf
}
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -413,7 +412,7 @@ [Components.common]
#
# USB
#
- Omap35xxPkg/PciEmulation/PciEmulation.inf
+ Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf {
@@ -427,31 +426,31 @@ [Components.common]
#
# Nand Flash
#
- Omap35xxPkg/Flash/Flash.inf
+ Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
#
# MMC/SD
#
EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
- Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
+ Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
#
# I2C
#
- Omap35xxPkg/SmbusDxe/Smbus.inf
+ Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
#
# SoC Drivers
#
- Omap35xxPkg/Gpio/Gpio.inf
- Omap35xxPkg/InterruptDxe/InterruptDxe.inf
- Omap35xxPkg/TimerDxe/TimerDxe.inf
- Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
+ Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
+ Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
+ Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
+ Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
#
# Power IC
#
- Omap35xxPkg/TPS65950Dxe/TPS65950.inf
+ Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
#
# Bds
@@ -472,6 +471,8 @@ [Components.common]
# Shell
#
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+ <LibraryClasses>
+ NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
<PcdsFixedAtBuild>
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
}
@@ -486,6 +487,7 @@ [Components.common]
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+ NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
index 1d5c0040b5eb..a2cfeb3bc27b 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -45,7 +45,7 @@ [FD.BeagleBoard_EFI]
#
################################################################################
0x00000000|0x00000200
-FILE = BeagleBoardPkg/ConfigurationHeader.bin
+FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
0x00000200|0x00000008
DATA = {
@@ -123,31 +123,31 @@ [FV.FvMain]
#
# Nand Flash
#
- INF Omap35xxPkg/Flash/Flash.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf
#
# MMC/SD
#
INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
- INF Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
#
# I2C
#
- INF Omap35xxPkg/SmbusDxe/Smbus.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf
#
# SoC Drivers
#
- INF Omap35xxPkg/Gpio/Gpio.inf
- INF Omap35xxPkg/InterruptDxe/InterruptDxe.inf
- INF Omap35xxPkg/TimerDxe/TimerDxe.inf
- INF Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
#
# Power IC
#
- INF Omap35xxPkg/TPS65950Dxe/TPS65950.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf
#
# FAT filesystem + GPT/MBR partitioning
@@ -161,7 +161,7 @@ [FV.FvMain]
# USB Support
#
- INF Omap35xxPkg/PciEmulation/PciEmulation.inf
+ INF Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf
INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -203,7 +203,7 @@ [FV.FVMAIN_COMPACT]
READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE
- INF BeagleBoardPkg/PrePi/PeiUniCore.inf
+ INF Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf
FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH edk2-platforms 4/5] Platform/RDKQemu: fix platform build
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
` (2 preceding siblings ...)
2019-06-10 14:20 ` [PATCH edk2-platforms 3/5] Platform/BeagleBoard: fix platform build Ard Biesheuvel
@ 2019-06-10 14:20 ` Ard Biesheuvel
2019-06-10 14:20 ` [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines Ard Biesheuvel
2019-06-10 17:36 ` [PATCH edk2-platforms 0/5] fix broken platforms Leif Lindholm
5 siblings, 0 replies; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:20 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
Update RDKQemu.dsc to remove unnecessary Network libs, and add the
missing status code router dependencies that have been added to the
upstream ArmVirtQemu platform which this platform is based on.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 64b6699ae78e..f0ed4f11e81d 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -36,6 +36,7 @@ [Defines]
DEFINE NETWORK_TLS_ENABLE = FALSE
DEFINE NETWORK_IP6_ENABLE = FALSE
DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE
+ DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
!include ArmVirtPkg/ArmVirt.dsc.inc
@@ -57,6 +58,7 @@ [LibraryClasses.common]
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+ PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
@@ -65,13 +67,13 @@ [LibraryClasses.common]
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
-!if $(HTTP_BOOT_ENABLE) == TRUE
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
[LibraryClasses.common.PEIM]
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
+[LibraryClasses.common.DXE_DRIVER]
+ ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+
[LibraryClasses.common.UEFI_DRIVER]
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
@@ -127,9 +129,6 @@ [PcdsFixedAtBuild.common]
#
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
-!if $(HTTP_BOOT_ENABLE) == TRUE
- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
-!endif
# System Memory Base -- fixed at 0x4000_0000
gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000
@@ -154,6 +153,8 @@ [PcdsFixedAtBuild.common]
gRdkTokenSpaceGuid.PcdRdkConfFileName|L"Rdk.conf"
gRdkTokenSpaceGuid.PcdRdkConfFileDevicePath|L"PciRoot(0x0)/Pci(0x2,0x0)"
+ gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3
+
[PcdsFixedAtBuild.AARCH64]
# Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,
# if the entry point version is >= 3.0. AARCH64 OSes cannot assume the
@@ -407,6 +408,10 @@ [Components.common]
Platform/Comcast/Application/SecureBoot/SecureBoot.inf
Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
+ # Status Code Routing
+ #
+ MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+
[Components.AARCH64]
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
@@ -414,8 +419,5 @@ [Components.AARCH64]
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
}
-[PcdsFixedAtBuild]
- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
-
[BuildOptions]
GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
` (3 preceding siblings ...)
2019-06-10 14:20 ` [PATCH edk2-platforms 4/5] Platform/RDKQemu: " Ard Biesheuvel
@ 2019-06-10 14:20 ` Ard Biesheuvel
2019-06-10 18:06 ` Leif Lindholm
2019-06-10 17:36 ` [PATCH edk2-platforms 0/5] fix broken platforms Leif Lindholm
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 14:20 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
Stop using deprecated string conversion routines so we can stop
un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 +++++++--
Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
Platform/Comcast/RDKQemu/RDKQemu.dsc | 3 ---
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
index ed893bd5af6a..df16c326cc57 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
@@ -90,6 +90,7 @@ ListBlockIos (
UINTN NumHandles;
UINT16 *DeviceFullPath;
DISKIO_PARTITION_LIST *Entry;
+ RETURN_STATUS RetStatus;
InitializeListHead (&mPartitionListHead);
@@ -146,11 +147,13 @@ ListBlockIos (
// Copy handle and partition name
Entry->PartitionHandle = AllHandles[LoopIndex];
- StrnCpy (
+ RetStatus = StrnCpyS (
Entry->PartitionName,
+ PARTITION_NAME_MAX_LENGTH,
PartitionName,
PARTITION_NAME_MAX_LENGTH
);
+ ASSERT_RETURN_ERROR (RetStatus);
InsertTailList (&mPartitionListHead, &Entry->Link);
break;
}
@@ -176,8 +179,13 @@ OpenPartition (
DISKIO_PARTITION_LIST *Entry;
SPARSE_HEADER *SparseHeader;
UINT16 UnicodePartitionName[100];
+ RETURN_STATUS RetStatus;
- AsciiStrToUnicodeStr ( PartitionName, UnicodePartitionName);
+ RetStatus = AsciiStrToUnicodeStrS (PartitionName, UnicodePartitionName,
+ sizeof (UnicodePartitionName));
+ if (RETURN_ERROR (RetStatus)) {
+ return EFI_OUT_OF_RESOURCES;
+ }
DEBUG((DEBUG_INFO, "Unicode partition name %s\n", UnicodePartitionName));
Status = ListBlockIos (UnicodePartitionName);
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
index dd695651026a..6f98562eff84 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
@@ -8,8 +8,6 @@
#define MAX_VAR 6
-#define ALLOCATE_STRING_MEM(X) AllocateZeroPool((X + 1) * sizeof(CHAR16))
-
/**
* list_for_each_entry - iterate over list of given type
* @pos: the type * to use as a loop cursor.
@@ -53,10 +51,13 @@ SaveString (
IN CHAR16 *String2
)
{
- *Dest = ALLOCATE_STRING_MEM (StrLen (String1) + StrLen (String2));
+ UINTN StringLength;
+
+ StringLength = StrLen (String1) + StrLen (String2) + 1;
+ *Dest = AllocatePool (StringLength * sizeof(CHAR16));
ASSERT (Dest != NULL);
- StrCat (*Dest, String1);
- StrCat (*Dest, String2);
+ StrCpyS (*Dest, StringLength, String1);
+ StrCatS (*Dest, StringLength, String2);
}
STATIC
@@ -74,11 +75,13 @@ LsFiles (
BOOLEAN NoFile;
CHAR16 *TempPath;
DIR_NODE *Node;
+ UINTN StringLength;
NoFile = FALSE;
- TempPath = ALLOCATE_STRING_MEM (StrLen(DirPath) + 1);
- StrCat (TempPath, DirPath);
- StrCat (TempPath, L"/");
+ StringLength = StrLen(DirPath) + 2;
+ TempPath = AllocatePool (StringLength * sizeof(CHAR16));
+ StrCpyS (TempPath, StringLength, DirPath);
+ StrCatS (TempPath, StringLength, L"/");
Status = GetFileHandler (&FileHandle, DirPath, EFI_FILE_MODE_READ);
ASSERT_EFI_ERROR (Status);
@@ -192,6 +195,7 @@ InitVarList (
UINTN Next;
CHAR8 *VarDelimiter[2];
EFI_STATUS Status;
+ UINTN StringLength;
VarDelimiter[0] = "=";
VarDelimiter[1] = "\"";
@@ -212,10 +216,10 @@ InitVarList (
if (VarResult[OuterLoopIndex][InnerLoopIndex]) {
FreePool (VarResult[OuterLoopIndex][InnerLoopIndex]);
}
- VarResult[OuterLoopIndex][InnerLoopIndex] = \
- ALLOCATE_STRING_MEM (AsciiStrLen (&FileData[Current]));
- AsciiStrToUnicodeStr (&FileData[Current], \
- VarResult[OuterLoopIndex][InnerLoopIndex]);
+ StringLength = AsciiStrLen (&FileData[Current]) + 1;
+ VarResult[OuterLoopIndex][InnerLoopIndex] = AllocatePool (StringLength);
+ AsciiStrToUnicodeStrS (&FileData[Current],
+ VarResult[OuterLoopIndex][InnerLoopIndex], StringLength);
//skip new line
Next += 2;
}
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index f0ed4f11e81d..440d2ace917c 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -418,6 +418,3 @@ [Components.AARCH64]
<LibraryClasses>
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
}
-
-[BuildOptions]
- GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines
2019-06-10 14:20 ` [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines Ard Biesheuvel
@ 2019-06-10 18:06 ` Leif Lindholm
2019-06-10 18:55 ` Ard Biesheuvel
0 siblings, 1 reply; 12+ messages in thread
From: Leif Lindholm @ 2019-06-10 18:06 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: devel
On Mon, Jun 10, 2019 at 04:20:06PM +0200, Ard Biesheuvel wrote:
> Stop using deprecated string conversion routines so we can stop
> un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 +++++++--
> Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
> Platform/Comcast/RDKQemu/RDKQemu.dsc | 3 ---
> 3 files changed, 26 insertions(+), 17 deletions(-)
>
> diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> index ed893bd5af6a..df16c326cc57 100644
> --- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> +++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> @@ -90,6 +90,7 @@ ListBlockIos (
> UINTN NumHandles;
> UINT16 *DeviceFullPath;
> DISKIO_PARTITION_LIST *Entry;
> + RETURN_STATUS RetStatus;
>
> InitializeListHead (&mPartitionListHead);
>
> @@ -146,11 +147,13 @@ ListBlockIos (
>
> // Copy handle and partition name
> Entry->PartitionHandle = AllHandles[LoopIndex];
> - StrnCpy (
> + RetStatus = StrnCpyS (
> Entry->PartitionName,
> + PARTITION_NAME_MAX_LENGTH,
> PartitionName,
> PARTITION_NAME_MAX_LENGTH
> );
> + ASSERT_RETURN_ERROR (RetStatus);
Would we not want to return an error here, for non-DEBUG builds?
> InsertTailList (&mPartitionListHead, &Entry->Link);
> break;
> }
> @@ -176,8 +179,13 @@ OpenPartition (
> DISKIO_PARTITION_LIST *Entry;
> SPARSE_HEADER *SparseHeader;
> UINT16 UnicodePartitionName[100];
> + RETURN_STATUS RetStatus;
>
> - AsciiStrToUnicodeStr ( PartitionName, UnicodePartitionName);
> + RetStatus = AsciiStrToUnicodeStrS (PartitionName, UnicodePartitionName,
> + sizeof (UnicodePartitionName));
> + if (RETURN_ERROR (RetStatus)) {
> + return EFI_OUT_OF_RESOURCES;
> + }
> DEBUG((DEBUG_INFO, "Unicode partition name %s\n", UnicodePartitionName));
>
> Status = ListBlockIos (UnicodePartitionName);
> diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> index dd695651026a..6f98562eff84 100644
> --- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> +++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> @@ -8,8 +8,6 @@
>
> #define MAX_VAR 6
>
> -#define ALLOCATE_STRING_MEM(X) AllocateZeroPool((X + 1) * sizeof(CHAR16))
> -
> /**
> * list_for_each_entry - iterate over list of given type
> * @pos: the type * to use as a loop cursor.
> @@ -53,10 +51,13 @@ SaveString (
> IN CHAR16 *String2
> )
> {
> - *Dest = ALLOCATE_STRING_MEM (StrLen (String1) + StrLen (String2));
> + UINTN StringLength;
> +
> + StringLength = StrLen (String1) + StrLen (String2) + 1;
> + *Dest = AllocatePool (StringLength * sizeof(CHAR16));
Minor, and just part of the shuffle, but - space after sizeof?
(At least one more below.)
/
Leif
> ASSERT (Dest != NULL);
> - StrCat (*Dest, String1);
> - StrCat (*Dest, String2);
> + StrCpyS (*Dest, StringLength, String1);
> + StrCatS (*Dest, StringLength, String2);
> }
>
> STATIC
> @@ -74,11 +75,13 @@ LsFiles (
> BOOLEAN NoFile;
> CHAR16 *TempPath;
> DIR_NODE *Node;
> + UINTN StringLength;
>
> NoFile = FALSE;
> - TempPath = ALLOCATE_STRING_MEM (StrLen(DirPath) + 1);
> - StrCat (TempPath, DirPath);
> - StrCat (TempPath, L"/");
> + StringLength = StrLen(DirPath) + 2;
> + TempPath = AllocatePool (StringLength * sizeof(CHAR16));
> + StrCpyS (TempPath, StringLength, DirPath);
> + StrCatS (TempPath, StringLength, L"/");
>
> Status = GetFileHandler (&FileHandle, DirPath, EFI_FILE_MODE_READ);
> ASSERT_EFI_ERROR (Status);
> @@ -192,6 +195,7 @@ InitVarList (
> UINTN Next;
> CHAR8 *VarDelimiter[2];
> EFI_STATUS Status;
> + UINTN StringLength;
>
> VarDelimiter[0] = "=";
> VarDelimiter[1] = "\"";
> @@ -212,10 +216,10 @@ InitVarList (
> if (VarResult[OuterLoopIndex][InnerLoopIndex]) {
> FreePool (VarResult[OuterLoopIndex][InnerLoopIndex]);
> }
> - VarResult[OuterLoopIndex][InnerLoopIndex] = \
> - ALLOCATE_STRING_MEM (AsciiStrLen (&FileData[Current]));
> - AsciiStrToUnicodeStr (&FileData[Current], \
> - VarResult[OuterLoopIndex][InnerLoopIndex]);
> + StringLength = AsciiStrLen (&FileData[Current]) + 1;
> + VarResult[OuterLoopIndex][InnerLoopIndex] = AllocatePool (StringLength);
> + AsciiStrToUnicodeStrS (&FileData[Current],
> + VarResult[OuterLoopIndex][InnerLoopIndex], StringLength);
> //skip new line
> Next += 2;
> }
> diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> index f0ed4f11e81d..440d2ace917c 100644
> --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
> +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> @@ -418,6 +418,3 @@ [Components.AARCH64]
> <LibraryClasses>
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> }
> -
> -[BuildOptions]
> - GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines
2019-06-10 18:06 ` Leif Lindholm
@ 2019-06-10 18:55 ` Ard Biesheuvel
2019-06-10 19:01 ` Leif Lindholm
0 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-10 18:55 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel-groups-io
On Mon, 10 Jun 2019 at 20:06, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Mon, Jun 10, 2019 at 04:20:06PM +0200, Ard Biesheuvel wrote:
> > Stop using deprecated string conversion routines so we can stop
> > un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
> >
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> > Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 +++++++--
> > Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
> > Platform/Comcast/RDKQemu/RDKQemu.dsc | 3 ---
> > 3 files changed, 26 insertions(+), 17 deletions(-)
> >
> > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > index ed893bd5af6a..df16c326cc57 100644
> > --- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > +++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > @@ -90,6 +90,7 @@ ListBlockIos (
> > UINTN NumHandles;
> > UINT16 *DeviceFullPath;
> > DISKIO_PARTITION_LIST *Entry;
> > + RETURN_STATUS RetStatus;
> >
> > InitializeListHead (&mPartitionListHead);
> >
> > @@ -146,11 +147,13 @@ ListBlockIos (
> >
> > // Copy handle and partition name
> > Entry->PartitionHandle = AllHandles[LoopIndex];
> > - StrnCpy (
> > + RetStatus = StrnCpyS (
> > Entry->PartitionName,
> > + PARTITION_NAME_MAX_LENGTH,
> > PartitionName,
> > PARTITION_NAME_MAX_LENGTH
> > );
> > + ASSERT_RETURN_ERROR (RetStatus);
>
> Would we not want to return an error here, for non-DEBUG builds?
>
Actually, I think I should just change the last arg to
PARTITION_NAME_MAX_LENGTH - 1, in which case no input length based
error is ever returned.
> > InsertTailList (&mPartitionListHead, &Entry->Link);
> > break;
> > }
> > @@ -176,8 +179,13 @@ OpenPartition (
> > DISKIO_PARTITION_LIST *Entry;
> > SPARSE_HEADER *SparseHeader;
> > UINT16 UnicodePartitionName[100];
> > + RETURN_STATUS RetStatus;
> >
> > - AsciiStrToUnicodeStr ( PartitionName, UnicodePartitionName);
> > + RetStatus = AsciiStrToUnicodeStrS (PartitionName, UnicodePartitionName,
> > + sizeof (UnicodePartitionName));
> > + if (RETURN_ERROR (RetStatus)) {
> > + return EFI_OUT_OF_RESOURCES;
> > + }
> > DEBUG((DEBUG_INFO, "Unicode partition name %s\n", UnicodePartitionName));
> >
> > Status = ListBlockIos (UnicodePartitionName);
> > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > index dd695651026a..6f98562eff84 100644
> > --- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > +++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > @@ -8,8 +8,6 @@
> >
> > #define MAX_VAR 6
> >
> > -#define ALLOCATE_STRING_MEM(X) AllocateZeroPool((X + 1) * sizeof(CHAR16))
> > -
> > /**
> > * list_for_each_entry - iterate over list of given type
> > * @pos: the type * to use as a loop cursor.
> > @@ -53,10 +51,13 @@ SaveString (
> > IN CHAR16 *String2
> > )
> > {
> > - *Dest = ALLOCATE_STRING_MEM (StrLen (String1) + StrLen (String2));
> > + UINTN StringLength;
> > +
> > + StringLength = StrLen (String1) + StrLen (String2) + 1;
> > + *Dest = AllocatePool (StringLength * sizeof(CHAR16));
>
> Minor, and just part of the shuffle, but - space after sizeof?
> (At least one more below.)
>
Right, will fix.
> > ASSERT (Dest != NULL);
> > - StrCat (*Dest, String1);
> > - StrCat (*Dest, String2);
> > + StrCpyS (*Dest, StringLength, String1);
> > + StrCatS (*Dest, StringLength, String2);
> > }
> >
> > STATIC
> > @@ -74,11 +75,13 @@ LsFiles (
> > BOOLEAN NoFile;
> > CHAR16 *TempPath;
> > DIR_NODE *Node;
> > + UINTN StringLength;
> >
> > NoFile = FALSE;
> > - TempPath = ALLOCATE_STRING_MEM (StrLen(DirPath) + 1);
> > - StrCat (TempPath, DirPath);
> > - StrCat (TempPath, L"/");
> > + StringLength = StrLen(DirPath) + 2;
> > + TempPath = AllocatePool (StringLength * sizeof(CHAR16));
> > + StrCpyS (TempPath, StringLength, DirPath);
> > + StrCatS (TempPath, StringLength, L"/");
> >
> > Status = GetFileHandler (&FileHandle, DirPath, EFI_FILE_MODE_READ);
> > ASSERT_EFI_ERROR (Status);
> > @@ -192,6 +195,7 @@ InitVarList (
> > UINTN Next;
> > CHAR8 *VarDelimiter[2];
> > EFI_STATUS Status;
> > + UINTN StringLength;
> >
> > VarDelimiter[0] = "=";
> > VarDelimiter[1] = "\"";
> > @@ -212,10 +216,10 @@ InitVarList (
> > if (VarResult[OuterLoopIndex][InnerLoopIndex]) {
> > FreePool (VarResult[OuterLoopIndex][InnerLoopIndex]);
> > }
> > - VarResult[OuterLoopIndex][InnerLoopIndex] = \
> > - ALLOCATE_STRING_MEM (AsciiStrLen (&FileData[Current]));
> > - AsciiStrToUnicodeStr (&FileData[Current], \
> > - VarResult[OuterLoopIndex][InnerLoopIndex]);
> > + StringLength = AsciiStrLen (&FileData[Current]) + 1;
> > + VarResult[OuterLoopIndex][InnerLoopIndex] = AllocatePool (StringLength);
> > + AsciiStrToUnicodeStrS (&FileData[Current],
> > + VarResult[OuterLoopIndex][InnerLoopIndex], StringLength);
> > //skip new line
> > Next += 2;
> > }
> > diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > index f0ed4f11e81d..440d2ace917c 100644
> > --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > @@ -418,6 +418,3 @@ [Components.AARCH64]
> > <LibraryClasses>
> > NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> > }
> > -
> > -[BuildOptions]
> > - GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES
> > --
> > 2.20.1
> >
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines
2019-06-10 18:55 ` Ard Biesheuvel
@ 2019-06-10 19:01 ` Leif Lindholm
2019-06-11 10:12 ` Ard Biesheuvel
0 siblings, 1 reply; 12+ messages in thread
From: Leif Lindholm @ 2019-06-10 19:01 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel-groups-io
On Mon, Jun 10, 2019 at 08:55:03PM +0200, Ard Biesheuvel wrote:
> On Mon, 10 Jun 2019 at 20:06, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> >
> > On Mon, Jun 10, 2019 at 04:20:06PM +0200, Ard Biesheuvel wrote:
> > > Stop using deprecated string conversion routines so we can stop
> > > un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
> > >
> > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > ---
> > > Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 +++++++--
> > > Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
> > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 3 ---
> > > 3 files changed, 26 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > index ed893bd5af6a..df16c326cc57 100644
> > > --- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > +++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > @@ -90,6 +90,7 @@ ListBlockIos (
> > > UINTN NumHandles;
> > > UINT16 *DeviceFullPath;
> > > DISKIO_PARTITION_LIST *Entry;
> > > + RETURN_STATUS RetStatus;
> > >
> > > InitializeListHead (&mPartitionListHead);
> > >
> > > @@ -146,11 +147,13 @@ ListBlockIos (
> > >
> > > // Copy handle and partition name
> > > Entry->PartitionHandle = AllHandles[LoopIndex];
> > > - StrnCpy (
> > > + RetStatus = StrnCpyS (
> > > Entry->PartitionName,
> > > + PARTITION_NAME_MAX_LENGTH,
> > > PartitionName,
> > > PARTITION_NAME_MAX_LENGTH
> > > );
> > > + ASSERT_RETURN_ERROR (RetStatus);
> >
> > Would we not want to return an error here, for non-DEBUG builds?
> >
>
> Actually, I think I should just change the last arg to
> PARTITION_NAME_MAX_LENGTH - 1, in which case no input length based
> error is ever returned.
Thats works for me.
With that, and the below style fixes:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> > > InsertTailList (&mPartitionListHead, &Entry->Link);
> > > break;
> > > }
> > > @@ -176,8 +179,13 @@ OpenPartition (
> > > DISKIO_PARTITION_LIST *Entry;
> > > SPARSE_HEADER *SparseHeader;
> > > UINT16 UnicodePartitionName[100];
> > > + RETURN_STATUS RetStatus;
> > >
> > > - AsciiStrToUnicodeStr ( PartitionName, UnicodePartitionName);
> > > + RetStatus = AsciiStrToUnicodeStrS (PartitionName, UnicodePartitionName,
> > > + sizeof (UnicodePartitionName));
> > > + if (RETURN_ERROR (RetStatus)) {
> > > + return EFI_OUT_OF_RESOURCES;
> > > + }
> > > DEBUG((DEBUG_INFO, "Unicode partition name %s\n", UnicodePartitionName));
> > >
> > > Status = ListBlockIos (UnicodePartitionName);
> > > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > > index dd695651026a..6f98562eff84 100644
> > > --- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > > +++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
> > > @@ -8,8 +8,6 @@
> > >
> > > #define MAX_VAR 6
> > >
> > > -#define ALLOCATE_STRING_MEM(X) AllocateZeroPool((X + 1) * sizeof(CHAR16))
> > > -
> > > /**
> > > * list_for_each_entry - iterate over list of given type
> > > * @pos: the type * to use as a loop cursor.
> > > @@ -53,10 +51,13 @@ SaveString (
> > > IN CHAR16 *String2
> > > )
> > > {
> > > - *Dest = ALLOCATE_STRING_MEM (StrLen (String1) + StrLen (String2));
> > > + UINTN StringLength;
> > > +
> > > + StringLength = StrLen (String1) + StrLen (String2) + 1;
> > > + *Dest = AllocatePool (StringLength * sizeof(CHAR16));
> >
> > Minor, and just part of the shuffle, but - space after sizeof?
> > (At least one more below.)
> >
>
> Right, will fix.
>
> > > ASSERT (Dest != NULL);
> > > - StrCat (*Dest, String1);
> > > - StrCat (*Dest, String2);
> > > + StrCpyS (*Dest, StringLength, String1);
> > > + StrCatS (*Dest, StringLength, String2);
> > > }
> > >
> > > STATIC
> > > @@ -74,11 +75,13 @@ LsFiles (
> > > BOOLEAN NoFile;
> > > CHAR16 *TempPath;
> > > DIR_NODE *Node;
> > > + UINTN StringLength;
> > >
> > > NoFile = FALSE;
> > > - TempPath = ALLOCATE_STRING_MEM (StrLen(DirPath) + 1);
> > > - StrCat (TempPath, DirPath);
> > > - StrCat (TempPath, L"/");
> > > + StringLength = StrLen(DirPath) + 2;
> > > + TempPath = AllocatePool (StringLength * sizeof(CHAR16));
> > > + StrCpyS (TempPath, StringLength, DirPath);
> > > + StrCatS (TempPath, StringLength, L"/");
> > >
> > > Status = GetFileHandler (&FileHandle, DirPath, EFI_FILE_MODE_READ);
> > > ASSERT_EFI_ERROR (Status);
> > > @@ -192,6 +195,7 @@ InitVarList (
> > > UINTN Next;
> > > CHAR8 *VarDelimiter[2];
> > > EFI_STATUS Status;
> > > + UINTN StringLength;
> > >
> > > VarDelimiter[0] = "=";
> > > VarDelimiter[1] = "\"";
> > > @@ -212,10 +216,10 @@ InitVarList (
> > > if (VarResult[OuterLoopIndex][InnerLoopIndex]) {
> > > FreePool (VarResult[OuterLoopIndex][InnerLoopIndex]);
> > > }
> > > - VarResult[OuterLoopIndex][InnerLoopIndex] = \
> > > - ALLOCATE_STRING_MEM (AsciiStrLen (&FileData[Current]));
> > > - AsciiStrToUnicodeStr (&FileData[Current], \
> > > - VarResult[OuterLoopIndex][InnerLoopIndex]);
> > > + StringLength = AsciiStrLen (&FileData[Current]) + 1;
> > > + VarResult[OuterLoopIndex][InnerLoopIndex] = AllocatePool (StringLength);
> > > + AsciiStrToUnicodeStrS (&FileData[Current],
> > > + VarResult[OuterLoopIndex][InnerLoopIndex], StringLength);
> > > //skip new line
> > > Next += 2;
> > > }
> > > diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > > index f0ed4f11e81d..440d2ace917c 100644
> > > --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > > +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> > > @@ -418,6 +418,3 @@ [Components.AARCH64]
> > > <LibraryClasses>
> > > NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> > > }
> > > -
> > > -[BuildOptions]
> > > - GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES
> > > --
> > > 2.20.1
> > >
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines
2019-06-10 19:01 ` Leif Lindholm
@ 2019-06-11 10:12 ` Ard Biesheuvel
0 siblings, 0 replies; 12+ messages in thread
From: Ard Biesheuvel @ 2019-06-11 10:12 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel-groups-io
On Mon, 10 Jun 2019 at 21:01, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Mon, Jun 10, 2019 at 08:55:03PM +0200, Ard Biesheuvel wrote:
> > On Mon, 10 Jun 2019 at 20:06, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > >
> > > On Mon, Jun 10, 2019 at 04:20:06PM +0200, Ard Biesheuvel wrote:
> > > > Stop using deprecated string conversion routines so we can stop
> > > > un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
> > > >
> > > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > > ---
> > > > Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 +++++++--
> > > > Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
> > > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 3 ---
> > > > 3 files changed, 26 insertions(+), 17 deletions(-)
> > > >
> > > > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > index ed893bd5af6a..df16c326cc57 100644
> > > > --- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > +++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > @@ -90,6 +90,7 @@ ListBlockIos (
> > > > UINTN NumHandles;
> > > > UINT16 *DeviceFullPath;
> > > > DISKIO_PARTITION_LIST *Entry;
> > > > + RETURN_STATUS RetStatus;
> > > >
> > > > InitializeListHead (&mPartitionListHead);
> > > >
> > > > @@ -146,11 +147,13 @@ ListBlockIos (
> > > >
> > > > // Copy handle and partition name
> > > > Entry->PartitionHandle = AllHandles[LoopIndex];
> > > > - StrnCpy (
> > > > + RetStatus = StrnCpyS (
> > > > Entry->PartitionName,
> > > > + PARTITION_NAME_MAX_LENGTH,
> > > > PartitionName,
> > > > PARTITION_NAME_MAX_LENGTH
> > > > );
> > > > + ASSERT_RETURN_ERROR (RetStatus);
> > >
> > > Would we not want to return an error here, for non-DEBUG builds?
> > >
> >
> > Actually, I think I should just change the last arg to
> > PARTITION_NAME_MAX_LENGTH - 1, in which case no input length based
> > error is ever returned.
>
> Thats works for me.
> With that, and the below style fixes:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
Thanks
Series pushed as cf5d0a48c1d9..9f814bbee5d5
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH edk2-platforms 0/5] fix broken platforms
2019-06-10 14:20 [PATCH edk2-platforms 0/5] fix broken platforms Ard Biesheuvel
` (4 preceding siblings ...)
2019-06-10 14:20 ` [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines Ard Biesheuvel
@ 2019-06-10 17:36 ` Leif Lindholm
5 siblings, 0 replies; 12+ messages in thread
From: Leif Lindholm @ 2019-06-10 17:36 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: devel
If you fold in the additions from the follow-up into 1/5, for 1-4/5:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
I have some comments on 5/5.
/
Leif
On Mon, Jun 10, 2019 at 04:20:01PM +0200, Ard Biesheuvel wrote:
> Fix the broken beagleboard and rdkqemu platforms, which were broken after
> recent changes that were applied to edk2, e.g., to move network modules into
> networkpkg. Also, bring rdkqemu up to date with some changes to ArmVirtQemu
> on which it is based.
>
> Ard Biesheuvel (5):
> Silicon/TexasInstruments/Omap35xxPkg: fix path references
> Platform/BeagleBoard: fix path references in .inf files
> Platform/BeagleBoard: fix platform build
> Platform/RDKQemu: fix platform build
> Platform/RDKQemu: stop using deprecated string conversion routines
>
> Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 54 ++++++++++----------
> Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 22 ++++----
> Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf | 12 ++---
> Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf | 2 +-
> Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 12 ++++-
> Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++-----
> Platform/Comcast/RDKQemu/RDKQemu.dsc | 23 ++++-----
> 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 +--
> 23 files changed, 118 insertions(+), 106 deletions(-)
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread