From nobody Mon Feb 9 14:50:33 2026 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 --- 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-