diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-12-12 18:56:07 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-12-12 19:15:15 +0000 |
| commit | 54fa1d8dfd08d5440151f874f0c4f5b3b6b0fcd0 (patch) | |
| tree | 0d74a4c6f421675cb6b845f736712260de8fb1f4 | |
| parent | 054921cef0f1e39c93c4a868aa1064a18c8dce34 (diff) | |
| download | edk2-platforms-54fa1d8dfd08d5440151f874f0c4f5b3b6b0fcd0.tar.xz | |
Platform/ARM/VExpressPkg: use dedicated PCD for fastboot product name
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 <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
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 80deaa6fd9..45f7f0f7ea 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -93,7 +93,7 @@ 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 47cb05a6e2..695553a94f 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec @@ -56,3 +56,4 @@ # 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 a01bf3c671..9a4a6c7007 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 07c5e1e230..c5b32d88f1 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -48,4 +48,4 @@ [Pcd]
gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath
- gArmPlatformTokenSpaceGuid.PcdFirmwareVendor
+ gArmVExpressTokenSpaceGuid.PcdAndroidFastbootProductName
|