Changeset 974 for branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

Timestamp:

Apr 15, 2015, 4:02:08 PM (9 years ago)

Author:

cfuguet

Message:

reconf: improve reconf:tsar_generic_iob simulation scripts

File:

• branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py (modified) (8 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

@@ -53 +53 @@
 IRQ_PER_PROC = 4
 USE_RAMDISK = False
+USE_NIC = False
 
 # virtual address increment for distributed memory segments in the GietVM OS
@@ -69 +70 @@
          nb_procs=4,
          nb_ttys=1,
-         fbf_width=FBF_WIDTH):
+         fbf_width=FBF_WIDTH,
+         ioc_type='BDV'):
     """This function describes the tsar_generic_iob platform and defines its
     parameters"""
@@ -89 +91 @@
     # define physical segments
     ram_base = 0x0000000000
-    ram_size = 0x10000000 / (x_size * y_size)
+    ram_size = 0x4000000 / (x_size * y_size)
 
     xcu_base = 0x00B0000000
@@ -151 +153 @@
 
     # external peripherals (accessible in cluster[0,0] only for this mapping)
+    pic = mapping.addPeriph('PIC', base=pic_base, size=pic_size,
+                            ptype='PIC', channels=32)
+
     mapping.addPeriph('IOB', base=iob_base, size=iob_size,
                       ptype='IOB')
 
-    mapping.addPeriph('BDV', base=bdv_base, size=bdv_size,
-                      ptype='IOC', subtype='BDV')
-
-    mapping.addPeriph('TTY', base=tty_base, size=tty_size,
-                      ptype='TTY', channels=nb_ttys)
-
-    mapping.addPeriph('NIC', base=nic_base, size=nic_size,
-                      ptype='NIC', channels=NB_NICS)
-
-    mapping.addPeriph('CMA', base=cma_base, size=cma_size,
-                      ptype='CMA', channels=2*NB_NICS)
+    bdv = mapping.addPeriph('BDV', base=bdv_base, size=bdv_size,
+                            ptype='IOC', subtype='BDV')
+
+    mapping.addIrq(pic, index=8, src=bdv, isrtype='ISR_BDV', channel=0)
+
+    tty = mapping.addPeriph('TTY', base=tty_base, size=tty_size,
+                            ptype='TTY', channels=nb_ttys)
+
+    for i in xrange(nb_ttys):
+        mapping.addIrq(pic, index=16+i, src=tty, isrtype='ISR_TTY_RX', channel=i)
+
+    if USE_NIC:
+        nic = mapping.addPeriph('NIC', base=nic_base, size=nic_size,
+                                ptype='NIC', channels=NB_NICS)
+
+        mapping.addIrq(pic, index=0, src=nic, isrtype='ISR_NIC_RX', channel=0)
+        mapping.addIrq(pic, index=1, src=nic, isrtype='ISR_NIC_RX', channel=1)
+        mapping.addIrq(pic, index=2, src=nic, isrtype='ISR_NIC_TX', channel=0)
+        mapping.addIrq(pic, index=3, src=nic, isrtype='ISR_NIC_TX', channel=1)
+
+    cma = mapping.addPeriph('CMA', base=cma_base, size=cma_size,
+                            ptype='CMA', channels=2*NB_NICS)
+
+    mapping.addIrq(pic, index=4, src=cma, isrtype='ISR_CMA', channel=0)
+    mapping.addIrq(pic, index=5, src=cma, isrtype='ISR_CMA', channel=1)
+    mapping.addIrq(pic, index=6, src=cma, isrtype='ISR_CMA', channel=2)
+    mapping.addIrq(pic, index=7, src=cma, isrtype='ISR_CMA', channel=3)
 
     mapping.addPeriph('FBF', base=fbf_base, size=fbf_size,
@@ -174 +195 @@
     mapping.addPeriph('ROM', base=rom_base, size=rom_size,
                       ptype='ROM')
-
-    pic = mapping.addPeriph('PIC', base=pic_base, size=pic_size,
-                            ptype='PIC', channels=32)
-
-    mapping.addIrq(pic, index=0, isrtype='ISR_NIC_RX', channel=0)
-    mapping.addIrq(pic, index=1, isrtype='ISR_NIC_RX', channel=1)
-    mapping.addIrq(pic, index=2, isrtype='ISR_NIC_TX', channel=0)
-    mapping.addIrq(pic, index=3, isrtype='ISR_NIC_TX', channel=1)
-    mapping.addIrq(pic, index=4, isrtype='ISR_CMA', channel=0)
-    mapping.addIrq(pic, index=5, isrtype='ISR_CMA', channel=1)
-    mapping.addIrq(pic, index=6, isrtype='ISR_CMA', channel=2)
-    mapping.addIrq(pic, index=7, isrtype='ISR_CMA', channel=3)
-    mapping.addIrq(pic, index=8, isrtype='ISR_BDV', channel=0)
-
-    for i in xrange(nb_ttys):
-        mapping.addIrq(pic, index=16+i, isrtype='ISR_TTY_RX', channel=i)
 
     # hardware components replicated in all clusters
@@ -198 +203 @@
             mapping.addRam('RAM', base=ram_base + offset, size=ram_size)
 
-            mapping.addPeriph('MMC', base=mmc_base + offset, size=mmc_size,
-                              ptype='MMC')
-
             mapping.addPeriph('DROM', base=drom_base + offset, size=drom_size,
                               ptype='DROM')
+
+            mmc = mapping.addPeriph('MMC', base=mmc_base + offset, size=mmc_size,
+                                    ptype='MMC')
 
             dma = mapping.addPeriph('DMA', base=dma_base + offset,
@@ -214 +219 @@
 
             # MMC IRQ replicated in all clusters
-            mapping.addIrq(xcu, index=0, isrtype='ISR_MMC')
+            mapping.addIrq(xcu, index=0, src=mmc, isrtype='ISR_MMC')
 
             # DMA IRQ replicated in all clusters
             for i in xrange(dma.channels):
-                mapping.addIrq(xcu, index=1+i, isrtype='ISR_DMA',
-                               channel=i)
+                mapping.addIrq(xcu, index=1+i, src=dma, isrtype='ISR_DMA', channel=i)
 
             # processors
@@ -374 +378 @@
     with open(hard_path, "w") as hard_config:
         hard_config.write(mapping.hard_config())
-    with open(dts_path, "w") as linux_dts:
-        linux_dts.write(mapping.linux_dts())
+
+    if dts_path != None:
+        with open(dts_path, "w") as linux_dts:
+            linux_dts.write(mapping.linux_dts())
 
 ################################# platform test ################################