From nobody Wed Apr 24 00:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42105+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42105+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1560176416; cv=none; d=zoho.com; s=zohoarc; b=L/hNpMQmZ1laQrIxMiJkf3/pgaPBA6pJusT8C0ntAmZqxBzAQi2H41pRn9t1bQb4CRWm0OjmCdNdd35OFu7dcS66PzhnVUxaxjGFloCYbxZ2L+SvDu9YqIsZgYHhtNyxEun3x20gux/R8vp0Bf231yVyeNu1sma+9bDvCJbTCc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560176416; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=E1tey3EoZA8FR+WbCcRr8U6QFpsGmL2E17Gi+bWpRL4=; b=ESmRC++cZ6NK+4Z0JviMSDYFvLrUTOss+qGptJ+Gg84WV2IEMPJxrZNYayOTtLAoGWtajP8Rj8jG611W9WuHSJxmln8/kf458RWJpcydBCXOdpR7x7hmn42427QJG6AdvlI6L8DqZoBUoriMYtKJwZsV5gu/OFehid+aV4mfLpM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42105+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560176416150567.7100658287136; Mon, 10 Jun 2019 07:20:16 -0700 (PDT) Return-Path: X-Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:15 -0700 X-Received: by mail-wm1-f66.google.com with SMTP id c6so8377505wml.0 for ; Mon, 10 Jun 2019 07:20:14 -0700 (PDT) X-Gm-Message-State: APjAAAU5NNxWOrTK5oYrubQH2FaMRw0mGeqE1ZUfbJkLCbfBUNlP0IFl CkOxA37ombwgT9apcuui7YEkTCoAgspDJw== X-Google-Smtp-Source: APXvYqyjLWBQcPCg3lBCN4L9HpPbgnbkhRxKJ/Il4HbTclPoVUhieevBB6jn3aU6dVgSEiXteOSLig== X-Received: by 2002:a1c:9696:: with SMTP id y144mr13842973wmd.73.1560176412880; Mon, 10 Jun 2019 07:20:12 -0700 (PDT) X-Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:11 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 1/5] Silicon/TexasInstruments/Omap35xxPkg: fix path references Date: Mon, 10 Jun 2019 16:20:02 +0200 Message-Id: <20190610142006.30007-2-ard.biesheuvel@linaro.org> In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560176415; bh=6I5bt7JVcC1muDEKk947600HNEpuTKOxBtqpnGSFf8M=; h=Cc:Date:From:Reply-To:Subject:To; b=hyE0uIGFl5OUcT440Nw8RV0VVeSW7xnqwUCMtuOyiprzRxEbaWjsCrw/CaPY+cZ0qrc Y/7awYMhpjaDf/FBtHzRr1KGUJ4dVwZNaEpqLsXAeQHgWKiziz6xiQlHCDwZNTFhyGpfw 79OM4hmb2XfqDtLsyB1G1EKMrXnL/M2wLII= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fix up all the path references to Omap35xxPkg itself, which have gone stale after the move into edk2-platforms. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- 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/LcdGraphicsOutpu= tDxe.inf | 8 ++++---- Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgent= TimerLib.inf | 7 +++---- Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf= | 4 ++-- Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTime= rLib.inf | 4 ++-- Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf = | 6 +++--- Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf = | 4 ++-- Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeCloc= kLib.inf | 4 ++-- Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPortLib.i= nf | 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] =20 [Packages] MdePkg/MdePkg.dec - Omap35xxPkg/Omap35xxPkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] PcdLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Gpio/Gpio.inf b/Silicon/T= exasInstruments/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 =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [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] =20 [Packages] ArmPkg/ArmPkg.dec - Omap35xxPkg/Omap35xxPkg.dec - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] BaseLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdG= raphicsOutputDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutp= utDxe/LcdGraphicsOutputDxe.inf index b017d8bf9258..65624ce7e189 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphics= OutputDxe.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphics= OutputDxe.inf @@ -18,12 +18,12 @@ [Sources.common] LcdGraphicsOutputBlt.c =20 [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 =20 [LibraryClasses] ArmLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLi= b/DebugAgentTimerLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/Deb= ugAgentTimerLib/DebugAgentTimerLib.inf index ee178e7bd26b..74c03eab7828 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/Debug= AgentTimerLib.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAgentTimerLib/Debug= AgentTimerLib.inf @@ -24,11 +24,10 @@ [Sources.common] =20 =20 [Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec ArmPkg/ArmPkg.dec - + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] BaseLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbS= erialLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/Gd= bSerialLib.inf index c372e35c5581..d13744f5875f 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLi= b.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/GdbSerialLi= b.inf @@ -21,9 +21,9 @@ [Sources.common] =20 =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] DebugLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/= Omap35xxTimerLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35x= xTimerLib/Omap35xxTimerLib.inf index ddb95c6542cb..0ef4ecdbca0d 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35x= xTimerLib.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35x= xTimerLib.inf @@ -24,9 +24,9 @@ [Sources.common] TimerLib.c =20 [Packages] - Omap35xxPkg/Omap35xxPkg.dec - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] DebugLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDm= aLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapDmaL= ib.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 =20 [Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] DebugLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.i= nf 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 =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] DebugLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/= RealTimeClockLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTim= eClockLib/RealTimeClockLib.inf index 85c914796bce..876546e1c198 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTim= eClockLib.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTim= eClockLib.inf @@ -15,9 +15,9 @@ [Sources.common] RealTimeClockLib.c =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] IoLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/Ser= ialPortLib.inf b/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib= /SerialPortLib.inf index 086ed3c2a985..a4946059556f 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPort= Lib.inf +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib/SerialPort= Lib.inf @@ -33,7 +33,7 @@ [LibraryClasses] [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Omap35xxPkg/Omap35xxPkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [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 =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [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 =20 [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] BaseLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf b/Sili= con/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] =20 [Packages] MdePkg/MdePkg.dec - Omap35xxPkg/Omap35xxPkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [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 =20 [Packages] - MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec - Omap35xxPkg/Omap35xxPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] BaseMemoryLib diff --git a/Silicon/TexasInstruments/Omap35xxPkg/TimerDxe/TimerDxe.inf b/S= ilicon/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 =20 [Packages] - Omap35xxPkg/Omap35xxPkg.dec - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [LibraryClasses] BaseLib --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42105): https://edk2.groups.io/g/devel/message/42105 Mute This Topic: https://groups.io/mt/32004761/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed Apr 24 00:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42106+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42106+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1560176417; cv=none; d=zoho.com; s=zohoarc; b=TG3a6AW4YhEeiX2ORS3n/K2dlqoFZ7TFH9b90ACAP4PycM+8vyrRsAzQsxZLdmWU+aWZKiMi5BwShUdkUfY0+o4me5oLbeWHXovVAC0pistZLK2oyBNL/O/Oo99LoLUYdndKJ+g3BJHalV96hjlGUTNt/t5SVzjN0o4Zsjfcus8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560176417; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=+wosasqIy7DVEgIbaNO+yAIUsTIAjlvy4P9bGl+I+oA=; b=CR1qBx5PKnD8bCh2ny0ulBJm5lZ04jbjPQLhCoDn3+Q+/18Jlf74OdSthWMcthT5Ysx28OAZitxMrNjyCFH9brfe43ZeBa/rNLVURgqjFLoId0stEnUAztrRMOpXcRbtRHATr0W/SuAPXvR1iyUDQSAUX5z8v1XY7DURKnsS6JI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42106+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560176417052127.10479560377564; Mon, 10 Jun 2019 07:20:17 -0700 (PDT) Return-Path: X-Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:16 -0700 X-Received: by mail-wm1-f66.google.com with SMTP id g135so8663382wme.4 for ; Mon, 10 Jun 2019 07:20:15 -0700 (PDT) X-Gm-Message-State: APjAAAWQ0J5jM751VQvecB/swYuiliL7wH67m2Yzt/HK40lESLBnpGDt Jlp03ltEX0KD0G90bDQ2W51J5XJDeH34yw== X-Google-Smtp-Source: APXvYqyLg2w4Bt+hEDnHYs8Xz62OXo3Su2vQNwnSQvV7kVOjYgn5vzYy4heHVXSYoceMWnRFvdY8XQ== X-Received: by 2002:a1c:4184:: with SMTP id o126mr13716086wma.68.1560176414163; Mon, 10 Jun 2019 07:20:14 -0700 (PDT) X-Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:13 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 2/5] Platform/BeagleBoard: fix path references in .inf files Date: Mon, 10 Jun 2019 16:20:03 +0200 Message-Id: <20190610142006.30007-3-ard.biesheuvel@linaro.org> In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560176416; bh=q7zq9uvRbptlB3ZeydGrhXYEwjxe+VdlrsnfJP2sPL4=; h=Cc:Date:From:Reply-To:Subject:To; b=ZgK0ygh9DOPOj8m3nE0AfSm/zbhs7qfGc3f80kde9TkAYibtJx0PJBcB1cO59EMagjA U9YMkdYg5Zr9QxrMtVBDX7C46FZ1OB/XHKjAoazbSh6fe5JpbUZ4/lfhTP21MRy9lXuAk 1UI5cDnxOjRkmOPd1IV1YkA2DvGDiOHQa0Y= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Leif Lindholm --- 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/Bea= gleBoardLib.inf b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLi= b/BeagleBoardLib.inf index 53f75a3ccc7e..6584323ccc86 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoar= dLib.inf +++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoar= dLib.inf @@ -15,13 +15,13 @@ [Defines] LIBRARY_CLASS =3D ArmPlatformLib =20 [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 =20 [LibraryClasses] IoLib diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/Res= etSystemLib.inf b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLi= b/ResetSystemLib.inf index 3f50b21c1887..03a94e0a1a05 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSyste= mLib.inf +++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSyste= mLib.inf @@ -25,7 +25,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Omap35xxPkg/Omap35xxPkg.dec + Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dec =20 [Pcd.common] gArmTokenSpaceGuid.PcdCpuResetAddress --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42106): https://edk2.groups.io/g/devel/message/42106 Mute This Topic: https://groups.io/mt/32004762/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed Apr 24 00:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42107+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42107+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1560176418; cv=none; d=zoho.com; s=zohoarc; b=kERxbcxO/REJX0ULhtB8NSFOZwIkBU7k/te574qGdHHG4TBP+vCH/xV/nQjqiK1wyZvq/FA5k/CBBZQ9rlDrQeg85Bglobscw5j+vHiSLcXz05ApySewmLn30jaGlQY9m6ldcGKAAlk6WNyUWJrHBpuxllXDtlyri3iuwV8uGcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560176418; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=oZCw5CJXrm3Gi3GEzQ5i/Jyd8PeZAqbvwGunKGdxUIc=; b=SFjPrzkVpWRfw6nqKsED6ci3KPMwjrOdaYQ0tTDWvClWpJSAhMfY1l2+LrDIozzdXKmL1IJx4hRAA+PS5vg9BP5041Ilonk6d+taByL4hxRzhoTQRZOSF3ReZjtn4w+SEDJuv71xQ8y0Q8NSkXExeCU6BpUFcumaLF1EGqb833w= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42107+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560176418429713.4732728532731; Mon, 10 Jun 2019 07:20:18 -0700 (PDT) Return-Path: X-Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:17 -0700 X-Received: by mail-wm1-f66.google.com with SMTP id u8so8364465wmm.1 for ; Mon, 10 Jun 2019 07:20:17 -0700 (PDT) X-Gm-Message-State: APjAAAU0KiXjSBPZsO+xZC6Q+qOkihVoQ2YhdgOYVTl0wrivzlT1luwT EWWebER4rO7CXXzDK60Zzi02AtP/01yf+Q== X-Google-Smtp-Source: APXvYqxUP2/D/UnN0xbdTUDrz8KtEH3cDS8DjZLNdEhgYRsARql/kqnG8u3L5qyqVu166V1TOu8szA== X-Received: by 2002:a1c:c915:: with SMTP id f21mr12699829wmb.123.1560176415492; Mon, 10 Jun 2019 07:20:15 -0700 (PDT) X-Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:14 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 3/5] Platform/BeagleBoard: fix platform build Date: Mon, 10 Jun 2019 16:20:04 +0200 Message-Id: <20190610142006.30007-4-ard.biesheuvel@linaro.org> In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560176418; bh=hO+keISe1ouZmEGX0S32SUFO3u4yNOfcEQJiUfoXg7o=; h=Cc:Date:From:Reply-To:Subject:To; b=Do/7EhcExNjzqZRTf66H/ihhcc8nQoQFyayipO8Qu8ELwgLlLyZDFv9sRJCgHngGYIS Ua1w91IGFlx8RpALEPyGxfZ5gNoQllWfYweM48UXo80eiV63Q2hgh826EfVhywliyH9EW lqwgDdr420VhiJrU1jWFxhzct+CxcjuY70A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 scope of the only two .INFs that use it, - add the NOOPT build target, Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- 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/Platf= orm/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 =3D 0x00010005 OUTPUT_DIRECTORY =3D Build/BeagleBoard SUPPORTED_ARCHITECTURES =3D ARM - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER =3D DEFAULT - FLASH_DEFINITION =3D BeagleBoardPkg/BeagleBoardPkg.fdf + FLASH_DEFINITION =3D Platform/BeagleBoard/BeagleBoardPkg/B= eagleBoardPkg.fdf =20 =20 [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/BeagleBoardLi= b/BeagleBoardLib.inf ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatfo= rmStackLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf =20 @@ -48,7 +48,7 @@ [LibraryClasses.common] BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf =20 - ResetSystemLib|BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLi= b/ResetSystemLib.inf =20 PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibN= ull.inf @@ -77,10 +77,10 @@ [LibraryClasses.common] CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf =20 - SerialPortLib|Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf + SerialPortLib|Silicon/TexasInstruments/Omap35xxPkg/Library/SerialPortLib= /SerialPortLib.inf SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf =20 - RealTimeClockLib|Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.i= nf + RealTimeClockLib|Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeCl= ockLib/RealTimeClockLib.inf =20 IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf =20 @@ -106,17 +106,16 @@ [LibraryClasses.common] =20 CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf =20 - TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf - OmapLib|Omap35xxPkg/Library/OmapLib/OmapLib.inf - OmapDmaLib|Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf - DebugAgentTimerLib|Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTime= rLib.inf + TimerLib|Silicon/TexasInstruments/Omap35xxPkg/Library/Omap35xxTimerLib/O= map35xxTimerLib.inf + OmapLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapLib/OmapLib.inf + OmapDmaLib|Silicon/TexasInstruments/Omap35xxPkg/Library/OmapDmaLib/OmapD= maLib.inf + DebugAgentTimerLib|Silicon/TexasInstruments/Omap35xxPkg/Library/DebugAge= ntTimerLib/DebugAgentTimerLib.inf =20 - GdbSerialLib|Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf + GdbSerialLib|Silicon/TexasInstruments/Omap35xxPkg/Library/GdbSerialLib/G= dbSerialLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.= inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.i= nf DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf =20 - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf =20 UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf @@ -150,7 +149,7 @@ [LibraryClasses.common.SEC] MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMe= moryAllocationLib.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf - MemoryInitPeiLib|BeagleBoardPkg/Library/MemoryInitPeiLib/MemoryInitPeiLi= b.inf + MemoryInitPeiLib|Platform/BeagleBoard/BeagleBoardPkg/Library/MemoryInitP= eiLib/MemoryInitPeiLib.inf =20 # 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/DxeExt= ractGuidedSectionLib.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/Dx= eHobPeCoffLib.inf =20 PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf =20 @@ -196,7 +195,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeL= ibFramework/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/Dx= eHobPeCoffLib.inf =20 =20 [LibraryClasses.ARM] @@ -357,7 +356,7 @@ [Components.common] # # SEC # - BeagleBoardPkg/PrePi/PeiUniCore.inf { + Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf { NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre= ssLib.inf } @@ -369,7 +368,7 @@ [Components.common] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32Gu= idedSectionExtractLib.inf - NULL|BeagleBoardPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustom= DecompressLib.inf + NULL|Platform/BeagleBoard/BeagleBoardPkg/Library/LzmaHobCustomDecomp= ressLib/LzmaHobCustomDecompressLib.inf } =20 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/NonDiscoverablePciDevic= eDxe.inf =20 MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf { @@ -427,31 +426,31 @@ [Components.common] # # Nand Flash # - Omap35xxPkg/Flash/Flash.inf + Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf =20 # # MMC/SD # EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf + Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf =20 # # I2C # - Omap35xxPkg/SmbusDxe/Smbus.inf + Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf =20 # # 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/LcdGraphicsOut= putDxe.inf =20 # # Power IC # - Omap35xxPkg/TPS65950Dxe/TPS65950.inf + Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf =20 # # Bds @@ -472,6 +471,8 @@ [Components.common] # Shell # ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { + + NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } @@ -486,6 +487,7 @@ [Components.common] NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePar= singLib.inf + NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf =20 diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platf= orm/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 =3D BeagleBoardPkg/ConfigurationHeader.bin +FILE =3D Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin =20 0x00000200|0x00000008 DATA =3D { @@ -123,31 +123,31 @@ [FV.FvMain] # # Nand Flash # - INF Omap35xxPkg/Flash/Flash.inf + INF Silicon/TexasInstruments/Omap35xxPkg/Flash/Flash.inf =20 # # MMC/SD # INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - INF Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf + INF Silicon/TexasInstruments/Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf =20 # # I2C # - INF Omap35xxPkg/SmbusDxe/Smbus.inf + INF Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.inf =20 # # 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/LcdGraphic= sOutputDxe.inf =20 # # Power IC # - INF Omap35xxPkg/TPS65950Dxe/TPS65950.inf + INF Silicon/TexasInstruments/Omap35xxPkg/TPS65950Dxe/TPS65950.inf =20 # # FAT filesystem + GPT/MBR partitioning @@ -161,7 +161,7 @@ [FV.FvMain] # USB Support # =20 - INF Omap35xxPkg/PciEmulation/PciEmulation.inf + INF Silicon/TexasInstruments/Omap35xxPkg/PciEmulation/PciEmulation.inf INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciD= eviceDxe.inf =20 INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf @@ -203,7 +203,7 @@ [FV.FVMAIN_COMPACT] READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 - INF BeagleBoardPkg/PrePi/PeiUniCore.inf + INF Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf =20 FILE FV_IMAGE =3D 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRE= D =3D TRUE { --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42107): https://edk2.groups.io/g/devel/message/42107 Mute This Topic: https://groups.io/mt/32004763/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed Apr 24 00:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42108+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42108+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1560176419; cv=none; d=zoho.com; s=zohoarc; b=fHUgoJTwGJZC32JddOpcLqai+JBnVOWNg3TmVtj+f6p6d3nnKuFpr9/fA+Gybr6qB8RAty3770othU8RssutG+cMBYjrhvdgTLbT9F5dxInQH+CcmbjXu0Zy60Uc0S6PCnOnbsU0re+XNvCWdlkz07xzuW9VbdStW0cTzT45/Tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560176419; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=KRRwhTHhrXdX8iI20PZ1Bbf00RyRTUuEJtYUhjtaeN8=; b=knQrPCbnAuvhhHTNmzJMF1Wlk5Z5jx+eGu/tAQEJz1Fg9RLjNnTJ5pIHEYsIyb1iShgElvFEHyyufPDuiqlzhz/DB3OviOntM6kjPDAiiG+2jllvtaNHjRph4Xjos93X30iH4LWHr7l+phR2sJmkrjJG4N6MR8HU9lE4t0jy7J4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42108+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560176419546429.23143827933995; Mon, 10 Jun 2019 07:20:19 -0700 (PDT) Return-Path: X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:18 -0700 X-Received: by mail-wr1-f66.google.com with SMTP id d18so9382226wrs.5 for ; Mon, 10 Jun 2019 07:20:18 -0700 (PDT) X-Gm-Message-State: APjAAAWMzFvuD6NyyaSloPx1HkI2W183pUMrDyTrMS+yAttgRxYE7daJ CnQ8lFfQGllTtpz9ggDwYI876w64/LmmVw== X-Google-Smtp-Source: APXvYqybzqBhUnVdwiKrFRDkfcnF2kXjTxTmkUIkxD+ttY9mj/Vcnsivx9jEFG8CkDSKonT/Hf6ZaA== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr26299148wrx.215.1560176416754; Mon, 10 Jun 2019 07:20:16 -0700 (PDT) X-Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:15 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 4/5] Platform/RDKQemu: fix platform build Date: Mon, 10 Jun 2019 16:20:05 +0200 Message-Id: <20190610142006.30007-5-ard.biesheuvel@linaro.org> In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560176419; bh=PNIZDvqWh4IwJ7Rt4isnfFez1HHQRdgogDFoL7pUvxo=; h=Cc:Date:From:Reply-To:Subject:To; b=ilw5mT56p6qTXsQYeexJXAXrietiMZLcCxupP+NWx0K9QrBzWdQcMABStNTfovVaHXu VgaZYU8w1as51jfhyl8uqDYKNRynhk90p1hkqjwi0JJGMXrdBUiCtBTLCFeekM2qH7mHk N3rF5yxMPwpDssCMcTOHsObgJM3wEyG+5Xo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Leif Lindholm --- Platform/Comcast/RDKQemu/RDKQemu.dsc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQem= u/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 =3D FALSE DEFINE NETWORK_IP6_ENABLE =3D FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE =3D TRUE + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE =20 !include ArmVirtPkg/ArmVirt.dsc.inc =20 @@ -57,6 +58,7 @@ [LibraryClasses.common] CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor= mBootManagerLib.inf + PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin= tScLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf @@ -65,13 +67,13 @@ [LibraryClasses.common] PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootMana= gerLib.inf -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif =20 [LibraryClasses.common.PEIM] ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoP= eiLib.inf =20 +[LibraryClasses.common.DXE_DRIVER] + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf + [LibraryClasses.common.UEFI_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf =20 @@ -127,9 +129,6 @@ [PcdsFixedAtBuild.common] # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 =20 -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif # System Memory Base -- fixed at 0x4000_0000 gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 =20 @@ -154,6 +153,8 @@ [PcdsFixedAtBuild.common] gRdkTokenSpaceGuid.PcdRdkConfFileName|L"Rdk.conf" gRdkTokenSpaceGuid.PcdRdkConfFileDevicePath|L"PciRoot(0x0)/Pci(0x2,0x0)" =20 + gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3 + [PcdsFixedAtBuild.AARCH64] # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry po= int, # if the entry point version is >=3D 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 =20 + # Status Code Routing + # + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCod= eRouterRuntimeDxe.inf + [Components.AARCH64] MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { @@ -414,8 +419,5 @@ [Components.AARCH64] NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } =20 -[PcdsFixedAtBuild] - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE - [BuildOptions] GCC:*_*_*_CC_FLAGS =3D -UDISABLE_NEW_DEPRECATED_INTERFACES --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42108): https://edk2.groups.io/g/devel/message/42108 Mute This Topic: https://groups.io/mt/32004765/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed Apr 24 00:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42109+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42109+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1560176420; cv=none; d=zoho.com; s=zohoarc; b=NKWunN+LPRy6puV/UbfxfINYJ2kDJzLzOz8KjBkWI6AIyhODUsIp+dtnS9G/dQ55HBMe/dMElHGjnwSrANrOausLor4iEZ4GtBUPr5OZxI6jZ3VwULoKLYuJS3mlPKC2oI/oUqw5P6NSDJGxNTIRdUzXOOOJV0DuC8v2IW5UinY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560176420; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Qp/rTTfoQrmmD/UXyBUm3Inp5f7G+HkS7BvpttD/8m4=; b=P87fhQsIG0E2/P5JQ9752Uz8dHWYsFDcG97o8j5Ri9vGCBL8Z3onvsDzpgB+C1qCbhHiUw697lGtEKmBQIqODFGIqFoIjzNmb66+qsTHQU9OTTN77L49iY0Msaj3UKOgdHmNmZchCHr9H+VfBs87wUlLz2Fu/FE0rEEdJX0ZA6U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42109+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560176420612924.5871606162333; Mon, 10 Jun 2019 07:20:20 -0700 (PDT) Return-Path: X-Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:19 -0700 X-Received: by mail-wm1-f65.google.com with SMTP id 22so8354759wmg.2 for ; Mon, 10 Jun 2019 07:20:19 -0700 (PDT) X-Gm-Message-State: APjAAAWC6/79ovkVL3pOudhKfmV/abdiR/AuqJbd5yh2fZuzhkYcBQu1 qSEoCUASaqAx0f2ZLF2mNNXYegN9ES+fxQ== X-Google-Smtp-Source: APXvYqz8YWMcvfji7MmvadfM2e6YchPUJaIbJuJ1OS2UTczQFzwbLFH7tygo+Dmjsx2PIZSaftuY3w== X-Received: by 2002:a7b:cb01:: with SMTP id u1mr15071434wmj.153.1560176417703; Mon, 10 Jun 2019 07:20:17 -0700 (PDT) X-Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:17 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines Date: Mon, 10 Jun 2019 16:20:06 +0200 Message-Id: <20190610142006.30007-6-ard.biesheuvel@linaro.org> In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560176420; bh=WCg+/M6MYlpOokeZY0W/QDY6ol3VPNbcMFjixZpJlog=; h=Cc:Date:From:Reply-To:Subject:To; b=mxqNclXtgVQEfyuGUPJI4x+8UwltereeYFJqom5TNIRQ1+FyGr4VOQyXiIOwOWIUyBu rvhC79vY2weCzrZSmVPw8wEmbF9wRB3R20V1rB0bOWF6VLtKdGVlfiVNBWAAfy/Tvne+i MTQOi3Z1sHChC1y/Ao7iKWwwgEa4EhVZNys= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Leif Lindholm --- 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; =20 InitializeListHead (&mPartitionListHead); =20 @@ -146,11 +147,13 @@ ListBlockIos ( =20 // Copy handle and partition name Entry->PartitionHandle =3D AllHandles[LoopIndex]; - StrnCpy ( + RetStatus =3D 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; =20 - AsciiStrToUnicodeStr ( PartitionName, UnicodePartitionName); + RetStatus =3D AsciiStrToUnicodeStrS (PartitionName, UnicodePartitionName, + sizeof (UnicodePartitionName)); + if (RETURN_ERROR (RetStatus)) { + return EFI_OUT_OF_RESOURCES; + } DEBUG((DEBUG_INFO, "Unicode partition name %s\n", UnicodePartitionName)); =20 Status =3D ListBlockIos (UnicodePartitionName); diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platfor= m/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 @@ =20 #define MAX_VAR 6 =20 -#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 =3D ALLOCATE_STRING_MEM (StrLen (String1) + StrLen (String2)); + UINTN StringLength; + + StringLength =3D StrLen (String1) + StrLen (String2) + 1; + *Dest =3D AllocatePool (StringLength * sizeof(CHAR16)); ASSERT (Dest !=3D NULL); - StrCat (*Dest, String1); - StrCat (*Dest, String2); + StrCpyS (*Dest, StringLength, String1); + StrCatS (*Dest, StringLength, String2); } =20 STATIC @@ -74,11 +75,13 @@ LsFiles ( BOOLEAN NoFile; CHAR16 *TempPath; DIR_NODE *Node; + UINTN StringLength; =20 NoFile =3D FALSE; - TempPath =3D ALLOCATE_STRING_MEM (StrLen(DirPath) + 1); - StrCat (TempPath, DirPath); - StrCat (TempPath, L"/"); + StringLength =3D StrLen(DirPath) + 2; + TempPath =3D AllocatePool (StringLength * sizeof(CHAR16)); + StrCpyS (TempPath, StringLength, DirPath); + StrCatS (TempPath, StringLength, L"/"); =20 Status =3D 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; =20 VarDelimiter[0] =3D "=3D"; VarDelimiter[1] =3D "\""; @@ -212,10 +216,10 @@ InitVarList ( if (VarResult[OuterLoopIndex][InnerLoopIndex]) { FreePool (VarResult[OuterLoopIndex][InnerLoopIndex]); } - VarResult[OuterLoopIndex][InnerLoopIndex] =3D \ - ALLOCATE_STRING_MEM (AsciiStrLen (&FileData[Current])); - AsciiStrToUnicodeStr (&FileData[Current], \ - VarResult[OuterLoopIndex][InnerLoopIndex]); + StringLength =3D AsciiStrLen (&FileData[Current]) + 1; + VarResult[OuterLoopIndex][InnerLoopIndex] =3D AllocatePool (StringLe= ngth); + AsciiStrToUnicodeStrS (&FileData[Current], + VarResult[OuterLoopIndex][InnerLoopIndex], StringLength); //skip new line Next +=3D 2; } diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQem= u/RDKQemu.dsc index f0ed4f11e81d..440d2ace917c 100644 --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc @@ -418,6 +418,3 @@ [Components.AARCH64] NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } - -[BuildOptions] - GCC:*_*_*_CC_FLAGS =3D -UDISABLE_NEW_DEPRECATED_INTERFACES --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42109): https://edk2.groups.io/g/devel/message/42109 Mute This Topic: https://groups.io/mt/32004766/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-