Index: /soft/giet_vm/Makefile
===================================================================
--- /soft/giet_vm/Makefile	(revision 326)
+++ /soft/giet_vm/Makefile	(revision 327)
@@ -182,12 +182,6 @@
 
 ### mapping generation: map.bin / map.xml / hard_config.h / giet_vsegs.ld
-map.bin: $(ARCH)/genmap.py  $(APP)/$(APP).py
-	giet_python/tsarmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
-
-hard_config.h: $(ARCH)/genmap.py $(APP)/$(APP).py  
-	giet_python/tsarmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
-
-giet_vsegs.ld: $(ARCH)/genmap.py $(APP)/$(APP).py  
-	giet_python/tsarmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
+map.bin hard_config.h giet_vsegs.ld: $(ARCH)/genmap.py  $(APP)/$(APP).py
+	giet_python/genmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
 
 ### drivers compilation
Index: /soft/giet_vm/giet_python/mapping.py
===================================================================
--- /soft/giet_vm/giet_python/mapping.py	(revision 326)
+++ /soft/giet_vm/giet_python/mapping.py	(revision 327)
@@ -779,5 +779,5 @@
 
         # build string
-        s =  '/* Generated by tsarmap for %s */\n'  % self.name 
+        s =  '/* Generated by genmap for %s */\n'  % self.name 
         s += '\n'
 
@@ -1086,5 +1086,5 @@
 
         # build string
-        s =  '/* Generated by tsarmap for %s */\n'  % self.name   
+        s =  '/* Generated by genmap for %s */\n'  % self.name   
         s += '\n'
         s += '#ifndef HARD_CONFIG_H\n'
@@ -1577,5 +1577,5 @@
                                    # used for almos configuration  
         # header
-        s =  '# arch.info file generated by tsarmap for %s\n' % self.name
+        s =  '# arch.info file generated by genmap for %s\n' % self.name
         s += '\n'
         s += '[HEADER]\n'