Index: soft/giet_vm/giet_python/genmap
===================================================================
--- soft/giet_vm/giet_python/genmap	(revision 411)
+++ soft/giet_vm/giet_python/genmap	(revision 421)
@@ -98,4 +98,8 @@
                    help = 'map the "convol" application for the GietVM' )
 
+parser.add_option( '--router', action = 'store_true', dest = 'router',     
+                   default = False,
+                   help = 'map the "router" application for the GietVM' )
+
 ######################################################################################
 #   Get command line arguments
Index: soft/giet_vm/giet_python/mapping.py
===================================================================
--- soft/giet_vm/giet_python/mapping.py	(revision 411)
+++ soft/giet_vm/giet_python/mapping.py	(revision 421)
@@ -148,5 +148,5 @@
                   x_size,                          # number of clusters in a row
                   y_size,                          # number of clusters in a column
-                  nprocs,                       # max number of processors per cluster
+                  nprocs,                          # max number of processors per cluster
                   x_width        = X_WIDTH,        # number of bits encoding x coordinate
                   y_width        = Y_WIDTH,        # number of bits encoding y coordinate
@@ -1238,5 +1238,5 @@
         s += '\n'
         s += '/{\n'
-        s += '  compatible = "tsar, %s";\n' % self.name
+        s += '  compatible = "tsar,%s";\n' % self.name
         s += '  #address-cells = <2>;\n'               # physical address on 64 bits
         s += '  #size-cells    = <1>;\n'               # segment size on 32 bits
@@ -1260,5 +1260,5 @@
                 y       = cluster.y
                 l       = proc.lpid
-                proc_id = (((x << self.y_width) + y) * self.nprocs) + l
+                proc_id = (((x << self.y_width) + y) << self.p_width) + l
                 s += '    cpu@%d_%d_%d {\n' %(x,y,l)
                 s += '      device_type = "cpu";\n'
@@ -1307,5 +1307,5 @@
 
                     s += '  %s: %s {\n'  % (irq_ctrl_name, irq_ctrl_name)
-                    s += '    compatible = "soclib, vci_xicu", "soclib, vci_xicu_timer";\n'
+                    s += '    compatible = "soclib,vci_xicu","soclib,vci_xicu_timer";\n'
                     s += '    interrupt-controller;\n'
                     s += '    #interrupt-cells = <1>;\n'
@@ -1321,5 +1321,5 @@
 
                     s += '  %s: %s {\n'  % (irq_ctrl_name, irq_ctrl_name)
-                    s += '    compatible = "soclib, vci_iopic";\n'
+                    s += '    compatible = "soclib,vci_iopic";\n'
                     s += '    interrupt-controller;\n'
                     s += '    #interrupt-cells = <1>;\n'
@@ -1357,5 +1357,5 @@
 
                     s += '  tty: tty {\n'
-                    s += '    compatible = "soclib, vci_multi_tty";\n'
+                    s += '    compatible = "soclib,vci_multi_tty";\n'
                     s += '    interrupt-parent = <&%s>;\n' % (irq_ctrl_name)
                     s += '    interrupt = <%d>;\n' % hwi_id
@@ -1377,5 +1377,5 @@
 
                         s += '  bdv: bdv {\n'
-                        s += '    compatible = "soclib:vci_blockdevice";\n'
+                        s += '    compatible = "soclib,vci_blockdevice";\n'
                         s += '    interrupt-parent = <&%s>;\n' % (irq_ctrl_name)
                         s += '    interrupt = <%d>;\n' % hwi_id
@@ -1408,5 +1408,5 @@
         s += '  };\n\n'
         s += '  cpuclk {\n'
-        s += '    compatible = "soclib, mips32_clksrc";\n'
+        s += '    compatible = "soclib,mips32_clksrc";\n'
         s += '    clocks = <&freq@50MHZ>;\n'
         s += '  };\n'