Changeset 796

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

Files:

• platforms/tsar_generic_leti/arch.py (modified) (2 diffs)
• platforms/tsar_generic_leti/top.cpp (modified) (1 diff)
• softs/tsar_boot/src/reset_ioc.c (modified) (5 diffs)

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 << ":";

trunk/softs/tsar_boot/src/reset_ioc.c

@@ -7 +7 @@
  *
  * \note   These functions call the specific disk controller driver depending
- *         on the USE_IOC_BDV, USE_IOC_SPI or USE_RAMDISK constants
+ *         on the USE_IOC_BDV, USE_IOC_SPI or USE_IOC_RDK constants
  */
 
@@ -13 +13 @@
 #include <defs.h>
 
-#if !defined(USE_IOC_BDV) && !defined(USE_IOC_SPI) && !defined(USE_RAMDISK)
+#if !defined(USE_IOC_BDV) && !defined(USE_IOC_SPI) && !defined(USE_IOC_RDK)
 #   error "One of the USE_IOC_* constants must be defined in the hard_config.h"
 #endif
 
-#if (USE_IOC_BDV + USE_IOC_SPI + USE_RAMDISK) != 1
+#if (USE_IOC_BDV + USE_IOC_SPI + USE_IOC_RDK) != 1
 #   error "Only one disk controller must be used"
 #endif
@@ -29 +29 @@
 #endif
 
-#if USE_RAMDISK
+#if USE_IOC_RDK
 #include <reset_rdk.h>
 #endif
@@ -42 +42 @@
 #elif USE_IOC_SPI
     return reset_sdc_init();
-#elif USE_RAMDISK
+#elif USE_IOC_RDK
     return reset_rdk_init();
 #else
@@ -65 +65 @@
 #elif USE_IOC_SPI
     return reset_sdc_read(lba, buffer, count);
-#elif USE_RAMDISK
+#elif USE_IOC_RDK
     return reset_rdk_read(lba, buffer, count);
 #else