Index: trunk/softs/tsar_boot/src/reset.S
===================================================================
--- trunk/softs/tsar_boot/src/reset.S	(revision 593)
+++ trunk/softs/tsar_boot/src/reset.S	(revision 606)
@@ -17,5 +17,5 @@
  * 
  * The replicated XICU is used to awake the sleeping processors:
- *      xicu_paddr_base = ICU_PADDR_BASE + (cluster_id << 32)
+ *      xicu_paddr_base = ICU_PADDR_BASE + (cluster_xy << 32)
  *
  * It is intended to be used with various operating systems or nano kernels,
@@ -35,5 +35,5 @@
     #include <mips32_registers.h>
 
-    /* These define should be consistent with values defined in ma;xml file  */
+    /* These define should be consistent with values defined in map.xml file  */
 
     .extern seg_reset_stack_base  
@@ -84,5 +84,5 @@
     mtc0    k0,     CP0_STATUS
 
-    /* All processors compute proc_id, local_id, cluster_id, cluster_increment */
+    /* All processors compute proc_id, lpid, cluster_xy */
 
     mfc0    k0,     CP0_EBASE
@@ -93,11 +93,6 @@
     la      k0,     NB_PROCS        /* k0 <= number of processors per cluster     */
     divu    t3,     k0
-    mfhi    t1                      /* t1 <= local_id   = proc_id % NB_PROCS      */
-    mflo    t2                      /* t2 <= cluster_id = proc_id / NB_PROCS      */
-
-    la      k0,     NB_CLUSTERS
-    sll     k1,     t2,     8       /* k1 <= 256*cluster_id                       */
-    div     k1,     k0              /* LO <= cluster_id * 256 / NB_CLUSTERS       */
-    mflo    t7                      /* t7 <= physical address extension (8 MSB)   */
+    mfhi    t1                      /* t1 <= lpid       = proc_id % NB_PROCS      */
+    mflo    t2                      /* t2 <= cluster_xy = proc_id / NB_PROCS      */
 
     /* All processors initialise the count register in CP0 */
@@ -108,5 +103,5 @@
      * All processors enable the WTI for XICU 
      * Each processor may have IRQ_PER_PROC irq outputs from the XICU
-     * In each cluster, the XICU base address depends on the cluster_id 
+     * In each cluster, the XICU base address depends on the cluster_xy 
      */
 
@@ -127,5 +122,5 @@
     sllv    t4,     t4,     t1      /* Set XICU[MSK_WTI][INDEX][local_id]         */
 
-    mtc2    t7,     CP2_PADDR_EXT   /* set PADDR extension                        */
+    mtc2    t2,     CP2_PADDR_EXT   /* set PADDR extension                        */
     sw      t4,     0(t5)           /* XICU[MSK_WTI][INDEX] <= t4                 */
     mtc2    zero,   CP2_PADDR_EXT   /* reset PADDR extension                      */
@@ -148,7 +143,6 @@
      * t0: global proc_id
      * t1: local proc_id
-     * t2: cluster id
+     * t2: cluster_xy
      * t3: xicu physical base address in cluster 0
-     * t7: paddr extension depending on cluster_id
      */
 
@@ -205,5 +199,4 @@
      * t2: cluster id
      * t3: xicu physical base address in cluster 0
-     * t7: Paddr extension depending on cluster_id
      */
 
@@ -222,5 +215,5 @@
      */
 
-    mtc2    t7,     CP2_PADDR_EXT   /* set PADDR extension                */
+    mtc2    t2,     CP2_PADDR_EXT   /* set PADDR extension                */
     lw      k0,     0(t5)           /* k0 <= XICU[WTI_REG][local_id]      */
     mtc2    zero,   CP2_PADDR_EXT   /* reset PADDR extension              */