From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-x22d.google.com (mail-io0-x22d.google.com [IPv6:2607:f8b0:4001:c06::22d]) (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 85A9621E95E01 for ; Wed, 30 Aug 2017 04:34:49 -0700 (PDT) Received: by mail-io0-x22d.google.com with SMTP id 81so4111737ioj.5 for ; Wed, 30 Aug 2017 04:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=kzctwie1l/uXhRfaUu9M4K2XAts5nPXqh3Sqbo9bzrY=; b=Qeu4CmfA7RY21uI41NN+aUIkYc+9BRNspQI2mN5rGnjiPjehQ9kG3Um+eR05fFbk/8 1Iy8xZo1NE0glQQQ9VvHY3JvLicxQtB1VfJuuAgDdIIWUM5CqPhsCM1jGe2QLVW2Sgl2 DlcNIHI7DheEop//eYOD1MDWa5HfLqDljyaxk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=kzctwie1l/uXhRfaUu9M4K2XAts5nPXqh3Sqbo9bzrY=; b=PjjVsIVp9clj/x7oJGVlU60UUtJ3JYayu5vDg7IKlKjrYP7qVnCJ2Jw7s1y64/KkEW beYTRfiwA60Awuhqdl604mjdiZ5o65hLmneYexc6EQcyPfUvvE+5Rf527UskrF5zxEk8 551RVXT4fcjZQH+horDCqksgFB023PrD6Z/ep9yut9F8ojePljhFh0TdwGN6axYc+Dq/ F/Gosyx6VW9TXqT9YiCXgH2a2CeQCfEEeNTM0G1mkJoLs+hrh3ZikTDjWugjSfC3Sbfn NL6cMsiFiWuh/eoSqi8r51yvh/6+/bPnrcT0Wupex3PGxvzHUg7zVy6fNLYLM2UY3VWs Cn3g== X-Gm-Message-State: AHPjjUh9C+bZyAz///sR54F07ux0j+UmjtJrDpteDE5tJWKTww3JyeQ7 69X+FE+J4O8OGWLE7gyvxWJfLDIs3DzX X-Received: by 10.107.16.217 with SMTP id 86mr889161ioq.149.1504093050444; Wed, 30 Aug 2017 04:37:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.162.1 with HTTP; Wed, 30 Aug 2017 04:37:29 -0700 (PDT) In-Reply-To: <20170830113533.7915-1-leif.lindholm@linaro.org> References: <20170830113533.7915-1-leif.lindholm@linaro.org> From: Ard Biesheuvel Date: Wed, 30 Aug 2017 12:37:29 +0100 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [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:34:49 -0000 Content-Type: text/plain; charset="UTF-8" On 30 August 2017 at 12:35, Leif Lindholm wrote: > 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 Reviewed-by: Ard Biesheuvel > --- > 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 >