From patchwork Wed Oct 25 06:45:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 117022 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp509615qgn; Tue, 24 Oct 2017 23:47:12 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TV3+L2FG3db173EgumYpaai3aAP9qKuTy3sPnGVNqsWe36hiyoC9zvzLHpBpngxDfAvAHu X-Received: by 10.98.189.9 with SMTP id a9mr1238414pff.323.1508914032441; Tue, 24 Oct 2017 23:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508914032; cv=none; d=google.com; s=arc-20160816; b=XywQ1kBirmMXMozeJo3RuswCnnbQ7F4lK9oWZdmM9YavKezR/cP393X+NF7PkjmjCH UpG807TrtZilPKI+3mlniM7IfoHbxXSG6aVfoVXYKDF8vCzZSX0c9jWA/2JQiXLs6cZY LGDlTkZetJQfDmrOXFFC29rnc3rCkxCUef21bV8x3e/3HljhT8O+90jNyMtfwb/PwZr+ nS2HuDPVmNSfrd7Sc4334LQtZwAiyofxfB7khh2OGTSV9GmlzuIR6fHwyXH9TZxBu5ZN RYPhgHRZsF3prLt8Tgp8NlcQnsw2nEaSryP9Q3ZWv60utOcGmlCMNNBNJcn2RM4xYyMd 4VTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jmJoGzCyxfnuiy35lxwLYhTDvf3B2vwZZvuI2f2AlfA=; b=umjGDvbjYxfqtpTwfXxsaN+N/jwZf2InySo268m437sAAvq+p4LBPbe/8SLQ5V2fdB PbfVeLWTqfG4QuwsIVTg9KnR4BueFupIsafGPjVPzDDGbk7Kki/G3+wVyJmHl8AlGKDA bnG0KznXJHyfwOZI6bje/l1Fdh8gwktBsKXH0+F6sbajfQq1XbqZcyjVaDpiezO445B1 pCwAd3ppXieecclZed+8Jm+O3+19SmUTl+OauJjHz7AhGCa9GzvTeqjB2pvg1SvTxq0m sZrt8dh/fjsuIRAe0K5npyjveuDZo+Q8B3w64kvgAPX/QeO0PTM88HbT/Yuywxx+Fr/N ilzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=lg+y/Auk; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a23si1402346pgd.261.2017.10.24.23.47.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 23:47:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=lg+y/Auk; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5D3DA2034CF7E; Tue, 24 Oct 2017 23:43:12 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::243; helo=mail-lf0-x243.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) (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 8B56E2034A7D9 for ; Tue, 24 Oct 2017 23:43:10 -0700 (PDT) Received: by mail-lf0-x243.google.com with SMTP id k40so26581517lfi.4 for ; Tue, 24 Oct 2017 23:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=skPeaC9nSwzOSMNALKrWczFKCOe99YjR7FYyQ4Kz6x4=; b=lg+y/AukU2+IJw+gZpc35jYKeUwsFGWZA8J7GrvCxORWaPnK/bCZSk4QoFsb1nFjjQ 06f6cC78WY2E98h5KgUEACdJrvXKYwijkJ8fx3Ac7VkTCGfUdKU8b0H77u5alS7yyMhk HfIv36gsW5cWK9wPIdxwfXZicaHIQ+ua6AQHeM9ZI1eo/GKN4U6bHEufZ56WXbYAjEIX 8IGkx74UBkEVH0WwOynYH0S8CJSyT9W9oOed9iraPFSM1O474EoCVPXOZjGjyGB74z6J BbyUpgBdoax8yd1UAQEZjQO2fSddB1e/FAXb9AJULIAHf/UVcjY17nXK92UGsAE/o0EO KCGQ== 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; bh=skPeaC9nSwzOSMNALKrWczFKCOe99YjR7FYyQ4Kz6x4=; b=HjvBOKTOGsbHlVCKrPLtEzmM+lTi7fD1AewLYiv9qN4ZxeGDhHmMjM5xFn0qZ/mA2N IyqTFSJkedh0le2wRJNhh3BdpYwA3dfnEeGKL3x02dhaLAZ2lupHJjch9+4fE8q5SFUK ciJ2Ki3TrGA4QfTd/cxIo6T940nV6/KixZMYYtM0nZp3GhumzyL3E1PECBmhaCTZJI/H mJT9BlGKU41zXbQCMLWfDufqWkn3OIIEq3z2eKn7ZpiEf5ReaX3y3l2QPDbSAE+Ptjzc 1t6tJ34QVAjtc1zFwdW30LnqWKibPYG+amM2ZZ82hD6B3owzZVvohXxKK2S2zr5f9pjb ZKHg== X-Gm-Message-State: AMCzsaXF3jDD3z8mXE5pXCHGwhYOIBXqunD9Xiyr7c+pFFTtB/k1yoRI dgQJreYmlVhJNyJvYK0TaSApCFVNCWs= X-Received: by 10.25.168.78 with SMTP id r75mr6294156lfe.65.1508914013448; Tue, 24 Oct 2017 23:46:53 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id r22sm513129ljr.16.2017.10.24.23.46.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 23:46:52 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Date: Wed, 25 Oct 2017 08:45:30 +0200 Message-Id: <1508913930-30886-9-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508913930-30886-1-git-send-email-mw@semihalf.com> References: <1508913930-30886-1-git-send-email-mw@semihalf.com> Subject: [edk2] [platforms: PATCH v2 8/8] Marvell/Armada: Add 32-bit ARM support 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: , Cc: jinghua@marvell.com, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Ard Biesheuvel Update the included components and library classes to make this platform build for 32-bit ARM. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm --- Platform/Marvell/Armada/Armada.dsc.inc | 3 +-- Platform/Marvell/Armada/Armada70x0.dsc | 4 ++-- Platform/Marvell/Armada/Armada70x0.fdf | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc index b0a8240..b9fc384 100644 --- a/Platform/Marvell/Armada/Armada.dsc.inc +++ b/Platform/Marvell/Armada/Armada.dsc.inc @@ -132,7 +132,6 @@ CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf -[LibraryClasses.AARCH64] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf @@ -362,7 +361,7 @@ # ARM Pcds gArmTokenSpaceGuid.PcdSystemMemoryBase|0 gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000 - gArmTokenSpaceGuid.PcdArmScr|0x531 + gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36 # Secure region reservation gMarvellTokenSpaceGuid.PcdSecureRegionBase|0x4000000 diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada/Armada70x0.dsc index 946c93e..0396e8e 100644 --- a/Platform/Marvell/Armada/Armada70x0.dsc +++ b/Platform/Marvell/Armada/Armada70x0.dsc @@ -39,8 +39,8 @@ PLATFORM_GUID = f837e231-cfc7-4f56-9a0f-5b218d746ae3 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) - SUPPORTED_ARCHITECTURES = AARCH64 + OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)-$(ARCH) + SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/Marvell/Armada/Armada70x0.fdf diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf index a94a9ff..ec2c368 100644 --- a/Platform/Marvell/Armada/Armada70x0.fdf +++ b/Platform/Marvell/Armada/Armada70x0.fdf @@ -237,7 +237,7 @@ READ_LOCK_STATUS = TRUE # ############################################################################ -[Rule.AARCH64.SEC] +[Rule.Common.SEC] FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED { TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi }