Changeset 546

Timestamp:

Apr 5, 2015, 12:02:09 AM (10 years ago)

Author:

alain

Message:

Replace the "SPI" name by "SDC" for the third disk controller type (beside BDV and HBA).

Location:

soft/giet_vm/giet_python

Files:

• genmap (modified) (3 diffs)
• mapping.py (modified) (10 diffs)

soft/giet_vm/giet_python/genmap

@@ -74 +74 @@
                    help = 'define frame buffer width and heigth' )
 
+parser.add_option( '--ioc', type = 'string', dest = 'ioc_type',
+                   default = 'BDV',
+                   help = 'define type of IOC: BDV / HBA / SDC / RDK' )
+
 parser.add_option( '--v', action = 'store_true', dest = 'verbose',
                    default = False,
@@ -141 +145 @@
 nb_ttys        = options.nb_ttys     # number of TTY channels           
 fbf_size       = options.fbf_size    # frame buffer width & heigth
+ioc_type       = options.ioc_type    # ioc controller type
 
 verbose        = options.verbose     # report on map.bin generation if True
@@ -178 +183 @@
 
 # build mapping calling the function (function name)
-mapping = select.arch( x_size, y_size, nb_procs, nb_ttys, fbf_size )
+mapping = select.arch( x_size, y_size, nb_procs, nb_ttys, fbf_size, ioc_type )
 print '[genmap] platform %s build' % mapping.name 
 

soft/giet_vm/giet_python/mapping.py

@@ -69 +69 @@
                   'BDV',
                   'HBA',
-                  'SPI',
-                  'NONE',
+                  'SDC',
                  ]
 
@@ -101 +100 @@
                   'ISR_MMC',
                   'ISR_DMA',
-                  'ISR_SPI',
+                  'ISR_SDC',
                   'ISR_MWR',
                   'ISR_HBA',
@@ -111 +110 @@
                   'PTAB',
                   'PERI',
-                  'MWMR',      # deprecated
-                  'LOCK',      # deprecated
                   'BUFFER',
-                  'BARRIER',   # deprecated
-                  'CONST',     # deprecated
-                  'MEMSPACE',  # deprecated
                   'SCHED',      
                   'HEAP',
@@ -339 +333 @@
             if ( ((prev.vbase + prev.length) > vbase ) and 
                  ((vbase + length) > prev.vbase) and
-                 (prev.name != name) ):
+                 (prev.name[0:15] != name[0:15]) ):
                 print '[genmap error] in addGlobal()'
                 print '    global vseg %s overlap %s' % (name, prev.name)
-                print '    %s : base = %x / size = %x' %( name, vbase, size )
-                print '    %s : base = %x / size = %x' %( prev.name, prev.vbase, prev.size )
+                print '    %s : base = %x / size = %x' %(name, vbase, length)
+                print '    %s : base = %x / size = %x' %(prev.name, prev.vbase, prev.length)
                 sys.exit(1)
 
@@ -508 +502 @@
         byte_stream += self.int2bytes(4,  self.total_irqs)
         byte_stream += self.int2bytes(4,  self.total_periphs)
-        byte_stream += self.str2bytes(32, self.name)
+        byte_stream += self.str2bytes(64, self.name)
 
         if ( verbose ):
@@ -786 +780 @@
 
         use_bdv = False
-        use_spi = False
+        use_sdc = False
         use_hba = False
 
@@ -828 +822 @@
                     if   ( periph.subtype == 'BDV' ): use_bdv = True
                     elif ( periph.subtype == 'HBA' ): use_hba = True
-                    elif ( periph.subtype == 'SPI' ): use_spi = True
+                    elif ( periph.subtype == 'SDC' ): use_sdc = True
 
                 elif ( periph.ptype == 'MMC' ):
@@ -910 +904 @@
         if use_hba         : nb_iocs += 1
         if use_bdv         : nb_iocs += 1
-        if use_spi         : nb_iocs += 1
+        if use_sdc         : nb_iocs += 1
         if self.use_ramdisk: nb_iocs += 1
         assert ( nb_iocs == 1 )
@@ -1021 +1015 @@
         s += '#define USE_PIC                %d\n'    % ( nb_pic != 0 )
         s += '#define USE_FBF                %d\n'    % ( nb_fbf != 0 )
+        s += '#define USE_NIC                %d\n'    % ( nb_nic != 0 )
         s += '\n'
         s += '#define USE_IOC_BDV            %d\n'    % use_bdv
-        s += '#define USE_IOC_SPI            %d\n'    % use_spi
+        s += '#define USE_IOC_SDC            %d\n'    % use_sdc
         s += '#define USE_IOC_HBA            %d\n'    % use_hba
         s += '#define USE_IOC_RDK            %d\n'    % self.use_ramdisk
@@ -1506 +1501 @@
                         sys.exit(1)
 
-                    elif ( periph.subtype == 'SPI' ):
-
-                        # get irq line index associated to spi
+                    elif ( periph.subtype == 'SDC' ):
+
+                        # get irq line index associated to sdc
                         irq_in = 0xFFFFFFFF
                         for irq in irq_tgt.irqs:
-                            if ( irq.isrtype == 'ISR_SPI' ): irq_in = irq.srcid
+                            if ( irq.isrtype == 'ISR_SDC' ): irq_in = irq.srcid
                         if ( irq_in == 0xFFFFFFFF ):
                             print '[genmap error] in netbsd.dts()'
-                            print '    ISR_SPI not found'
+                            print '    ISR_SDC not found'
                             sys.exit(1)
 
                         s += '  %s@0x%x {\n'  % (periph.pseg.name, periph.pseg.base)
-                        s += '    device_type = "soclib:spi";\n'
+                        s += '    device_type = "soclib:sdc";\n'
                         s += '    irq = <&{/%s@0x%x} %d>;\n' % (irq_tgt.pseg.name,irq_tgt.pseg.base,irq_in)
                         s += '    reg = <0x%x  0x%x  0x%x>;\n' % (msb, lsb, size)