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:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::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 2526621B02821 for ; Tue, 12 Dec 2017 11:03:20 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id f206so701472wmf.5 for ; Tue, 12 Dec 2017 11:08:00 -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=1eTAqAieblIUpVbstk+/uqSdg4loDfYX6+Qzojd54hk=; b=bpx0j1e4PtBEebEfble7EbhXWJxoBWnyVgzI3Mk92rp5y8x+z25vBUHzbrkVvo58B6 pZGq3dAGWXz9qLXwPWnuM46dv5LyJYto/8l06L05UPfpir69ha2z/rCvGDhXYfp31ZyO qYBLrIy3LDEaikRGqC6qdVEWccWx55golzAEY= 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=1eTAqAieblIUpVbstk+/uqSdg4loDfYX6+Qzojd54hk=; b=mBrCpNmWbBkC5qIML551W9xNe7Ij/pAZDUEezYrvQ6qX8I1qCfld3wJMz2qo9RuFuj mU+s6dR3v9I0chdKjLmeuuEE4mdaWd/xQGhAJ3PAmyMhiWlzKU+J7TsFaJEhd1mzv8Dd KnkO2FDPWwO9NzWtlzY86eSQKBJqP6LrVJpfSLPZoCVkvEGL5CKup6e98dpR3ZzOs/PH KUlmJUSZb7WuVzZwnaYb3dIWzFgG56Rh6pRaARpxPFeoxr75S349MLSfZWfa9pHNnp4V lBKyREMC83yYxtLYKk1HYmkAWES9q0KbwDPs5HtWGtWUj453P9CaF1rwRrApUR9phLAJ vd5g== X-Gm-Message-State: AKGB3mIjB6hQB5fEVGnsIwU1Ced3TkKy7xOH6ANsGNEUabr/rGDulczn 3wlbHahAdv8MrWms/qj4i8kEq7oZXUI= X-Google-Smtp-Source: ACJfBov4v2yrTdfBmDvszCkfzcwAT7Wb7WJdRQzKe5jCj7Q6eAUJAPw5+yuMhc4aauYc/Y1SBtwX5w== X-Received: by 10.28.48.4 with SMTP id w4mr2689585wmw.16.1513105678300; Tue, 12 Dec 2017 11:07:58 -0800 (PST) Received: from localhost.localdomain ([196.71.25.202]) by smtp.gmail.com with ESMTPSA id f19sm191058wmf.5.2017.12.12.11.07.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 11:07:57 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, Ard Biesheuvel Date: Tue, 12 Dec 2017 19:07:46 +0000 Message-Id: <20171212190747.15742-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212190747.15742-1-ard.biesheuvel@linaro.org> References: <20171212190747.15742-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms v3 1/2] Platform/ARM/VExpressPkg: use dedicated PCD for fastboot product name 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: Tue, 12 Dec 2017 19:03:21 -0000 Before retiring the gArmPlatformTokenSpaceGuid.PcdFirmwareVendor PCD, replace the only remaining and vaguely non-pointless reference with a new dedicated PCD defined in VExpressPkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 1 + Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c | 2 +- Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 80deaa6fd98d..45f7f0f7ea7d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -93,7 +93,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" + gArmVExpressTokenSpaceGuid.PcdAndroidFastbootProductName|"ARM Versatile Express" gArmPlatformTokenSpaceGuid.PcdCoreCount|5 diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec index 47cb05a6e265..695553a94f7f 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec @@ -56,3 +56,4 @@ [PcdsFixedAtBuild.common] # Device path of block device on which Fastboot will flash partitions # gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath|""|VOID*|0x00000006 + gArmVExpressTokenSpaceGuid.PcdAndroidFastbootProductName|""|VOID*|0x00000007 diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c index a01bf3c671ad..9a4a6c7007e4 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c @@ -446,7 +446,7 @@ ArmFastbootPlatformGetVar ( ) { if (AsciiStrCmp (Name, "product")) { - AsciiStrCpyS (Value, 61, FixedPcdGetPtr (PcdFirmwareVendor)); + AsciiStrCpyS (Value, 61, FixedPcdGetPtr (PcdAndroidFastbootProductName)); } else { *Value = '\0'; } diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf index 07c5e1e230e9..c5b32d88f17a 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -48,4 +48,4 @@ [Packages] [Pcd] gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor + gArmVExpressTokenSpaceGuid.PcdAndroidFastbootProductName -- 2.11.0