From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 63BEB2214E329 for ; Mon, 11 Dec 2017 07:39:42 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id k61so18045831wrc.4 for ; Mon, 11 Dec 2017 07:44:20 -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=Z8AYK39ChlQr21LIVGE9thZbWqtBUdNBduzsqRCP2ts=; b=dYLZQ1BXChVHhwBQbt12iwcbsKm1duDDkG7yJ4frGqdXpK/HulvCWJALUO53Zp3Aes oZBBkKnKxJbBeFx8JNZfXnh2PSp+tZyxNnU44ANfNKbB2Q17oGv1b28vd2SBWrVwTtvY GiEzqJWuE2AAqTmTsEq8/fDtpj9ZnodXEI/8U= 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=Z8AYK39ChlQr21LIVGE9thZbWqtBUdNBduzsqRCP2ts=; b=A809rp+I4sEUAPKJIheuKpfMobe5MFvopSb8Jrc24/tGGsG3tJzuRbkLW2TO6UCU19 4r9F/+4ES7w/yybkIzpv+xswWy/oj3hpNVplAawtktlbY5wPXn/ehWrEdqBVv5PJrYYk 6Y0t0MBN/za4KE+6Iad8RgCt5JbR26vnSoOWbQmR/76IaMSzon61rkdbgWLZTqs7N4wn 8W/7BTSr6fngt+OuN7wcf8SSin8DqfM+suYXRPcmr73wygg53LnQJgvRVA/tldPjPRvb Bsr0zFEggOyBJHgNnFq61WhvlqQL2szltYhKHpde9eFiZR98TazMUHov2zEdAns114UA cD4A== X-Gm-Message-State: AKGB3mId+6De7zui6hFcPK2qirhNNd7dfgekfy3jJewUDdhqmc4OwZg7 Osw7aMAMGIixfo0ibUKGRrhPlA++gCg= X-Google-Smtp-Source: ACJfBoubp3bhISokxL4kmpLwzAM4J8QMJPDPGzbGBEO4W8wVJJLzrpI9MBmTaxgsRT4KmoMPfE+MjA== X-Received: by 10.223.148.69 with SMTP id 63mr831485wrq.89.1513007058784; Mon, 11 Dec 2017 07:44:18 -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 s30sm17838201wrc.89.2017.12.11.07.44.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Dec 2017 07:44:17 -0800 (PST) Date: Mon, 11 Dec 2017 15:44:16 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org Message-ID: <20171211154416.sranbcmhsamp7ezc@bivouac.eciton.net> References: <20171208172147.21879-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20171208172147.21879-1-ard.biesheuvel@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH] Platform/ARM: retire duplicate LCD related PCDs 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: Mon, 11 Dec 2017 15:39:42 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Dec 08, 2017 at 05:21:47PM +0000, Ard Biesheuvel wrote: > In the rework between v1 and v2 of my ArmPlatformPkg cleanup series, > I restored the LCD output graphics drivers in mainline EDK2, but > forgot to restore some of the PCDs that now remain in ArmPlatformPkg > as well. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel Ah, no, that's what you do here ... sorry, read this one backwards somehow on previous pass. Reviewed-by: Leif Lindholm > --- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 4 ++-- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 2 -- > 3 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index 3be4d9d25ff5..5c7137e77115 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -155,8 +155,8 @@ [PcdsFixedAtBuild.common] > > !ifdef ARM_BIGLITTLE_TC2 > ## PL111 Lcd & HdLcd > - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 > - gArmVExpressTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000 > + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 > + gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000 > gArmVExpressTokenSpaceGuid.PcdHdLcdVideoModeOscId|5 > !endif > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index 3dc74ffe9df5..c7710564df5e 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -140,7 +140,7 @@ [PcdsFixedAtBuild.common] > > !ifdef EDK2_ENABLE_PL111 > ## PL111 Versatile Express Motherboard controller > - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 > + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 > !endif > > ## PL180 MMC/SD card controller > diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec > index 4c004275d2e2..47cb05a6e265 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec > +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec > @@ -47,11 +47,9 @@ [PcdsFixedAtBuild.common] > # > # For a list of mode numbers look in LcdArmVExpress.c > # > - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x0|UINT32|0x00000001 > gArmVExpressTokenSpaceGuid.PcdPL111LcdMaxMode|3|UINT32|0x00000002 > gArmVExpressTokenSpaceGuid.PcdPL111LcdVideoModeOscId|1|UINT32|0x00000003 > > - gArmVExpressTokenSpaceGuid.PcdArmHdLcdBase|0x0|UINT32|0x00000004 > gArmVExpressTokenSpaceGuid.PcdHdLcdVideoModeOscId|0|UINT32|0x00000005 > > # > -- > 2.11.0 >