From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 00FD221E95E0B for ; Wed, 30 Aug 2017 04:32:54 -0700 (PDT) Received: by mail-wm0-x230.google.com with SMTP id u126so7963386wmg.1 for ; Wed, 30 Aug 2017 04:35:36 -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; bh=OPzaQon4YiZ2w3qMBJlZaUhF7zCd5Xe8TVH1NdjbWuk=; b=cNyRo23DqPLso+7b3S7XHEotrkUWfKvPDUEQf46Ka6iSd1GSnBsJajeX1Ws3Fpt+x7 uR7xNytRIsIi4gq+nu3MhywjF7p1tlm3/6mcmjh4ZQVaORqhBYL4BOoB2sUjQF2MpGey CkV7LH9tG0o+9iK/7rsXpvjKQu2PtmJAW7Kls= 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; bh=OPzaQon4YiZ2w3qMBJlZaUhF7zCd5Xe8TVH1NdjbWuk=; b=Tnddt4HDUE9nQZzAOUEPJ8vbnX0E9nvonGYUGGfyBecV/IU/YA+eVyN4PZsUYE2Po8 m27Uoj2RCbFTBx+VV/dHsVQxub86TgNuNp4Pp/UPZiUfQGTRQKBhQVhoNKbmJ03WxIzm Ty+P9R31UIroSGqo4iwIQVETphQjJ7o0iH9x92v29MV64lCwb7mErUMNDLnEfF7oWLIx WbQeXJXNTmiuQUIZGRqRrqBs4138wqqE7eFxofpePh/9ZmApuxY+YXAUyuPW+rrRxNEs ettZ+cOBsl8vMY1BbYqEgRgIZzaJ5puDc3znB1cgSBOEQRe8h4FOpxz6q/Xtt7iwusfe k/hA== X-Gm-Message-State: AHYfb5gI/ZbTFPWi945Y9vs83v0P5Mkmy11tZunjspjiJAavLa+c7yc7 xHVZsE+6/+9QuKkXPccXSA== X-Received: by 10.28.135.15 with SMTP id j15mr1041429wmd.127.1504092934807; Wed, 30 Aug 2017 04:35:34 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id o191sm3296655wmg.5.2017.08.30.04.35.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 04:35:34 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: ard.biesheuvel@linaro.org Date: Wed, 30 Aug 2017 12:35:33 +0100 Message-Id: <20170830113533.7915-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH] EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 11:32:55 -0000 EmbeddedPkg should be architecture agnostic, but a few issues were preventing other architectures to build individual components directly from the .dsc: - The AndroidBoot/AndroidFastBoot support have a dependency on BdsLib, which only has resolutions for ARM/AARCH64. Move them to an arch-restricted Components section. - The Isp1761UsbDxe driver is not 64-bit compatible. It should be converted to UEFI driver model, but for now just move it to a new Components.ARM section. (Also delete non-useful declaration for AARCH64 in EmbeddedPkg.dec.) - Lan9118Dxe has an unused ArmLib entry. Drop it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf | 1 - EmbeddedPkg/EmbeddedPkg.dec | 3 --- EmbeddedPkg/EmbeddedPkg.dsc | 37 +++++++++++++++------------ 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf index 055a055299..74169d86a1 100644 --- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf +++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf @@ -38,7 +38,6 @@ NetLib UefiDriverEntryPoint BaseMemoryLib - ArmLib IoLib DevicePathLib diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index ccdf38e36a..0be102ad9c 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -195,9 +195,6 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011 - # ISP1761 USB OTG Controller - gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT64|0x00000021 - [PcdsFixedAtBuild.IA32] gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011 diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index 012721a332..d7ee6a3018 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -267,24 +267,7 @@ EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - # FDT installation - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - - # It depends on BdsLib that depends on TimerLib - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf - } - - EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { - - # It depends on BdsLib that depends on TimerLib - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf - } - EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf - EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf - # Drivers - EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf @@ -299,5 +282,25 @@ EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf +[Components.ARM] + EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf + +[Components.ARM, Components.AARCH64] + EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { + + # It depends on BdsLib that depends on TimerLib + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + } + EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf + EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf + + # FDT installation + EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + + # It depends on BdsLib that depends on TimerLib + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + } + [Components.IA32, Components.X64, Components.IPF, Components.ARM] EmbeddedPkg/GdbStub/GdbStub.inf -- 2.11.0