From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=PPqENN/2; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) 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 Received: by mail-wm1-f66.google.com with SMTP id u8so8364465wmm.1 for ; Mon, 10 Jun 2019 07:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m2rTRQFDutE7vmYcjwY2L7vpoWwB2Jyff4CNFWRnkeo=; b=PPqENN/22pAQoqFoycZcqbxE0duN3BUpS0J5lXpNS4gn80iSAFvtv7POVU/pAcmuh1 XnwcZsEW1foz0ryik4RVpeOtzMcnVxJG255fiD4IdxOjoqGaURwiZbqhVCQZBzCReXI+ dtKmJr549E+6mZxIYKHxufe1fuxY8y1aHwCK3UYT1v4AD6ddzz21f+s2L20IliStZvBV 1N4nrXvAJ1z6awCkmGDEqDeV1TkGtZJH6MnsPEmF34P3wSJ5xBSlzn8FTDPWj83gSCjw R1RzWqH+JTDUMhpwI0owER1kzP4QcT5tQ8kkN/2g849teJ8MocnZSXVH/9IpWgdsJ9C5 JlWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m2rTRQFDutE7vmYcjwY2L7vpoWwB2Jyff4CNFWRnkeo=; b=lSa0q0QzT1P0PSpnWY4F/KQPAjaQqDtvE+OBZAj8NM2AEQCrglftyZnbFCtN9SaNgb oN5Z8ScjiuLc6E+2rzo4OwSROxT7G9M1zCZfVBLt3bglVcWNmK+uHIfALLz2parQh5Bw f1dRrXtrCuHGPa6xi3mdk/9SPTaRjkYAVJN0A/zDKGefI8kr2Mae3Yjci4+UphyK0rau vspPranBHwrqUhkS1xAgR3qGrf1b9oJRUuvQj1o4wkIjdYjiQSF1LjqOxAWqqQnk8fnP gYlpjdrDKOo0x6rtWgA82IqymcHwSbKXvBQRYuitbKTFO356HTvOQsYzf1cSJt9K/WSS FdOQ== 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) Return-Path: 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: [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> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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/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 { NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } @@ -369,7 +368,7 @@ [Components.common] 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 { + + NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf 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