From patchwork Wed Nov 21 12:01:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151680 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1832396ljp; Wed, 21 Nov 2018 04:01:55 -0800 (PST) X-Google-Smtp-Source: AJdET5fxejBwoaHQq2wRSQDPU+GvjszoPbex01L8WwkLrfwZrmI9f7gvDgHIIMrqtNn8+lzWIny0 X-Received: by 2002:a24:3797:: with SMTP id r145-v6mr4937991itr.156.1542801715172; Wed, 21 Nov 2018 04:01:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542801715; cv=none; d=google.com; s=arc-20160816; b=xXRE80Bje3+36ppQX4pKgQSWMDr8QxPyX6QO/U1tL/ZoSoHYoszTWScJ0rimBAQL8G mlkgbmPvFavcvyav+9U/V0Uup2dCLNI00ptKsZQNtmEkLgmFbIbPvaYKftvZ3q8NPid0 ek1tukFSvQMvVfIGtyeCes7Tgi/+3rCjyqs6GXiL8rxL399JodsAv0d//66/s7VPnWMO yFNy4hOVA4bl86jlwdLiMdoOjLj+tbO98858D1Fv/I5NxKS3AI3i/S+4sS0CQHmZayCa 0Iye4ffpBgMI/RALWH637+SiY/1t36CWLq1GzB957cyEr8WUifpt6gQYi/0ApMFzE6NI 7TOA== 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; bh=BDd8m3Ulakn4YQpa2hDdGsRl+KTtyx/X6Q7MKaUhQ70=; b=VX24mFYZPDp6dgqrRb6zlQr/nhosBR8Son/HxT6KwPOlFBDvRnE1q4J8NXI+1sxpZp /s0h1mzYqi1EyHkugpUnl1W5C7b7vX+ApF9oTkF6pGtYxUqhfTOAmnBt4tsqZ0aOo8l5 jLgkZQcQoUDj0DxXKW1VeRjdvaisPl+DRQUqqimlYf7iGMYF+l5swhPqfL1WYXJzuQCZ egEi8XjYoZFQ9WKo0P8VdxyyCzqiMoSc+Fb/OFqeYT05srM0ypqlxQaEX18As1l3rV/9 wpm+SRdg94BcDzJq56sXUe0PuJaQwtRbd36uqyOLQ8tikGWuhDkdDOYAggDBdptbu7zP 5Z2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PLXzNFmz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id e130-v6si11162932iof.57.2018.11.21.04.01.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PLXzNFmz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2D8A921193780; Wed, 21 Nov 2018 04:01:54 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::544; helo=mail-ed1-x544.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (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 C3EB62119377C for ; Wed, 21 Nov 2018 04:01:52 -0800 (PST) Received: by mail-ed1-x544.google.com with SMTP id z28so4654168edi.8 for ; Wed, 21 Nov 2018 04:01:52 -0800 (PST) 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; bh=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=PLXzNFmz5ae4UlnWRZxOtW7U9tZgHL/9z71uwLp0FVYF5PHr19Vd99EoemYSVjhntA NcDdPlN8OI3sj6QV/XZ7nD4LVSJk0IEoqdO5ZyOjvXL8l6GP2E0Eqc8rHNumvc51RiHM KriU8GJUfjhVxxHWuGQfJKcPa2YszLuAcMCwU= 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=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=IbL3tQn10pyaLvmKoxqb/EsL9vgvXUjCJt8tBo9oa/iX28K7wJuynZvzvogQs78Ktn 5PQTsRwZI5bdIVxokq2Ug6VChRbFuMluw1u88VXTESbA5pOSYFl8QVFCh7jg9LRQ1zdj crmVIQOnM845pI6FUmTeHYiMc9EGErUwVMwrX39r9nMHutN9d3wIhnXos939uRjv90XS dxXAg/pKTgynd2wVVboisI+7GqyUmBFYOrpKVwl8EPtbmMct2/RJcVAh1bYEDCeki6y7 /FFvqHTtK+Jo1JoCYsZbJqz8Ealcc+wtgIaQxyhQC5270hANxmE039P5xovKj8itHNFP v1sg== X-Gm-Message-State: AGRZ1gJcVhyQweLstLpvkFbPoBu7+J0m+lFeoCF8Vxn3kTmUOw2nqDwE GJJrKLTHN3b0YVrrQvCxt3v6w98P4Zkf4g== X-Received: by 2002:a17:906:1155:: with SMTP id i21-v6mr4870588eja.110.1542801710942; Wed, 21 Nov 2018 04:01:50 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id c2sm13044290edv.14.2018.11.21.04.01.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:50 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 21 Nov 2018 13:01:43 +0100 Message-Id: <20181121120145.3148-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181121120145.3148-1-ard.biesheuvel@linaro.org> References: <20181121120145.3148-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/3] Platform/ARM: replace hardcoded VenHW() device paths referring to NOR flash X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nariman.poushin@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The ArmPlatformPkg NOR flash driver has been updated to use device paths consisting of a fixed GUID and a numeric index rather than a separate GUID for each flash bank on a given system. This means all explicit device path references to NOR flash banks have to be brought up to date as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/JunoPkg/ArmJuno.dec | 2 +- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec index edbbb827ad45..c511796d8913 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dec +++ b/Platform/ARM/JunoPkg/ArmJuno.dec @@ -44,7 +44,7 @@ gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005 # Juno Device Trees are loaded from NOR Flash - gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/board.dtb"|VOID*|0x00000008 + gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/board.dtb"|VOID*|0x00000008 # MHU Register base used by SCMI Mailbox transport gArmJunoTokenSpaceGuid.PcdArmMtlDoorBell|0x2B1F0000|UINT64|0x00000024 diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index ac3d63bd4d39..55b9d64d3deb 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -176,7 +176,7 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc index 3f0ca9872e79..06d866d6dc30 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc @@ -163,7 +163,7 @@ gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000 # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)" # ARM OS Loader gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 0542808f7d0c..3a3b4e3dbbc8 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -172,7 +172,7 @@ # # Define the device path to the FDT for the platform # - gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/ca15a7" + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/ca15a7" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 752e525c3469..713c5637b074 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -355,7 +355,7 @@ # # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00);VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,02)" # RunAxf support via Dynamic Shell Command protocol # We want to use the Shell Libraries but don't want it to initialise