Changeset 796 for trunk/platforms

Timestamp:

Sep 9, 2014, 3:05:49 PM (10 years ago)

Author:

cfuguet

Message:

tsar_generic_leti, tsar_boot: used USE_IOC_RDK instead of USE_RAMDISK

• This is the name of the constant generated by the genmap tool into the hard_config.h file.

• Instantiating the block device in the arch.py file only when the ramdisk is not used (GIET-VM supports only one IO controller)

Location:

trunk/platforms/tsar_generic_leti

Files:

• arch.py (modified) (2 diffs)
• top.cpp (modified) (1 diff)

trunk/platforms/tsar_generic_leti/arch.py

@@ -159 +159 @@
     ###  external peripherals (accessible in cluster[0,0] only for this mapping)
 
-    bdv = mapping.addPeriph( 'BDV', base = bdv_base, size = bdv_size,
-                             ptype = 'IOC', subtype = 'BDV' )
+    if not use_ramdisk:
+        bdv = mapping.addPeriph( 'BDV', base = bdv_base, size = bdv_size,
+                                 ptype = 'IOC', subtype = 'BDV' )
 
     tty = mapping.addPeriph( 'TTY', base = tty_base, size = tty_size,
@@ -226 +227 @@
     ### global vsegs for external peripherals / identity mapping
 
-    mapping.addGlobal( 'seg_bdv', bdv_base, bdv_size, '__W_',
-                       vtype = 'PERI', x = 0, y = 0, pseg = 'BDV',
-                       identity = True )
+    if not use_ramdisk:
+        mapping.addGlobal( 'seg_bdv', bdv_base, bdv_size, '__W_',
+                           vtype = 'PERI', x = 0, y = 0, pseg = 'BDV',
+                           identity = True )
 
     mapping.addGlobal( 'seg_tty', tty_base, tty_size, '__W_',

trunk/platforms/tsar_generic_leti/top.cpp

@@ -601 +601 @@
    ////////////////////////////
 
-#if USE_RAMDISK
+#if USE_IOC_RDK
    std::ostringstream ramdisk_name;
    ramdisk_name << disk_name << "@" << std::hex << SEG_RDK_BASE << ":";