From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 82CC12119306F for ; Mon, 19 Nov 2018 11:30:03 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id s11so6448022wmh.1 for ; Mon, 19 Nov 2018 11:30:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BauHldoNbDyd/mWtWfHmuB+XS2GjEvstmLXk6gnnMLU=; b=YPkoYQTraQplakpYNQF54sUDhh9zxO6TVe8dIspfF4l75qvo7xVNuT4vY3qTcUFAbW vIOgyC+FAMV52qNuSH0rE+D+yg8+Fxi8FxHIC/NGvChmToWaHwLBFyEOr+bS+D4HAcqR QmpNpgfIe3AzZr+ly2pYiI3wqRU/Dj+YQLU1A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BauHldoNbDyd/mWtWfHmuB+XS2GjEvstmLXk6gnnMLU=; b=Azov6C637OFP41SkgVYpwDvJoD1polNaedZzdRKwctul0i/XPRxycPBvBR248VomsM QB9jtxnO4pgtcRXaPXjTEcymPY8Erl0dbh3EdVHT965K4wY6YrripXkrmYMC38Ret4FC 6h7VYXx8dd25wexP1icCVcpyZ4RKv3ASIXCAf1OBupxzODxWbWRNpyJG1oLs6ETTh4yj MUN6UawppOHTC0UZbCSsuQVVlQmjmigEofjPEF9hy7bWfRplQ5FHMTN2B1NrzhjGzFaN ajEvEhyOdy+Hq70dWI/MEuZX6ViEuPCMHSJsMqu2qKeIR2AHmwPaoCdzz0OErvQCDsHY yReQ== X-Gm-Message-State: AGRZ1gIo22weLJRb/WqZizrh1mveVHNM8W2fgJnboI3/xCIHpw1rqkYF iePeP7ik8HEY3i3KUWYHTp9QJw== X-Google-Smtp-Source: AFSGD/X2o9ENrqH8Q6w9Y38vTuAEp9HrseADeWrKVqdVUJGAHFqYg2wxbZFw5jcxviuSGxjc4Gh1lQ== X-Received: by 2002:a1c:400b:: with SMTP id n11mr8517966wma.85.1542655801931; Mon, 19 Nov 2018 11:30:01 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id g129sm13919606wmf.39.2018.11.19.11.30.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Nov 2018 11:30:01 -0800 (PST) Date: Mon, 19 Nov 2018 19:29:54 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, Nariman Poushin , Thomas Panakamattam Abraham Message-ID: <20181119192954.vwm237bs5cvy4wht@bivouac.eciton.net> References: <20181117012308.32680-1-ard.biesheuvel@linaro.org> <20181119191247.5jw5yuz2y5dicfbo@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: <20181119191247.5jw5yuz2y5dicfbo@bivouac.eciton.net> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms] 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: , X-List-Received-Date: Mon, 19 Nov 2018 19:30:03 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hmm, a follow-up question (which does not affect my r-b): We still keep the manually generated GUIDs in ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c, Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c, Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c, Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c, Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c, and indeed in the NOR_FLASH_DESCRIPTION struct in ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h Is this an opportunity for a negative diffstat? / Leif On Mon, Nov 19, 2018 at 07:12:47PM +0000, Leif Lindholm wrote: > On Fri, Nov 16, 2018 at 05:23:08PM -0800, Ard Biesheuvel wrote: > > 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 > > This looks good to me, but I'd like a comment from Thomas/Nariman. > > With that: > Reviewed-by: Leif Lindholm > > > --- > > 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(-) > > > > 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 > > -- > > 2.17.1 > >