ArmPkg/BdsLib: Update FDT CPU node format

- Based on Doc here:
  Repo: http://www.linux-arm.org/git?p=linux-2.6-lp.git
  Branch: dt-cpus-bindings
  File:   Documentation/devicetree/bindings/arm/cpus.txt

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14434 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
index 4ff0afeb7d93c1718ed84e6cc1302d90196da8e0..82177402045bfb269d3f6eb62e5de26f37431efc 100644 (file)
--- a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
+++ b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
@@ -535,7 +535,9 @@ PrepareFdt (
       ArmCoreInfoTable = ArmProcessorTable->ArmCpus;\r
 \r
       for (Index = 0; Index < ArmProcessorTable->NumberOfEntries; Index++) {\r
-        AsciiSPrint (Name, 10, "cpu@%d", Index);\r
+        CoreMpId = (UINTN) GET_MPID (ArmCoreInfoTable[Index].ClusterId,\r
+                             ArmCoreInfoTable[Index].CoreId);\r
+        AsciiSPrint (Name, 10, "cpu@%x", CoreMpId);\r
 \r
         // If the 'cpus' node did not exist then create all the 'cpu' nodes.\r
         // In case 'cpus' node is provided in the original FDT then we do not add\r
@@ -549,8 +551,7 @@ PrepareFdt (
           }\r
 \r
           fdt_setprop_string (fdt, cpu_node, "device_type", "cpu");\r
-          CoreMpId = (UINTN) GET_MPID (ArmCoreInfoTable[Index].ClusterId,\r
-                               ArmCoreInfoTable[Index].CoreId);\r
+\r
           CoreMpId = cpu_to_fdtn (CoreMpId);\r
           fdt_setprop (fdt, cpu_node, "reg", &CoreMpId, sizeof (CoreMpId));\r
           if (PsciSmcSupported) {\r