Changeset 796


Ignore:
Timestamp:
Sep 9, 2014, 3:05:49 PM (7 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_leti/arch.py

    r793 r796  
    159159    ###  external peripherals (accessible in cluster[0,0] only for this mapping)
    160160
    161     bdv = mapping.addPeriph( 'BDV', base = bdv_base, size = bdv_size,
    162                              ptype = 'IOC', subtype = 'BDV' )
     161    if not use_ramdisk:
     162        bdv = mapping.addPeriph( 'BDV', base = bdv_base, size = bdv_size,
     163                                 ptype = 'IOC', subtype = 'BDV' )
    163164
    164165    tty = mapping.addPeriph( 'TTY', base = tty_base, size = tty_size,
     
    226227    ### global vsegs for external peripherals / identity mapping
    227228
    228     mapping.addGlobal( 'seg_bdv', bdv_base, bdv_size, '__W_',
    229                        vtype = 'PERI', x = 0, y = 0, pseg = 'BDV',
    230                        identity = True )
     229    if not use_ramdisk:
     230        mapping.addGlobal( 'seg_bdv', bdv_base, bdv_size, '__W_',
     231                           vtype = 'PERI', x = 0, y = 0, pseg = 'BDV',
     232                           identity = True )
    231233
    232234    mapping.addGlobal( 'seg_tty', tty_base, tty_size, '__W_',
  • trunk/platforms/tsar_generic_leti/top.cpp

    r795 r796  
    601601   ////////////////////////////
    602602
    603 #if USE_RAMDISK
     603#if USE_IOC_RDK
    604604   std::ostringstream ramdisk_name;
    605605   ramdisk_name << disk_name << "@" << std::hex << SEG_RDK_BASE << ":";
  • trunk/softs/tsar_boot/src/reset_ioc.c

    r758 r796  
    77 *
    88 * \note   These functions call the specific disk controller driver depending
    9  *         on the USE_IOC_BDV, USE_IOC_SPI or USE_RAMDISK constants
     9 *         on the USE_IOC_BDV, USE_IOC_SPI or USE_IOC_RDK constants
    1010 */
    1111
     
    1313#include <defs.h>
    1414
    15 #if !defined(USE_IOC_BDV) && !defined(USE_IOC_SPI) && !defined(USE_RAMDISK)
     15#if !defined(USE_IOC_BDV) && !defined(USE_IOC_SPI) && !defined(USE_IOC_RDK)
    1616#   error "One of the USE_IOC_* constants must be defined in the hard_config.h"
    1717#endif
    1818
    19 #if (USE_IOC_BDV + USE_IOC_SPI + USE_RAMDISK) != 1
     19#if (USE_IOC_BDV + USE_IOC_SPI + USE_IOC_RDK) != 1
    2020#   error "Only one disk controller must be used"
    2121#endif
     
    2929#endif
    3030
    31 #if USE_RAMDISK
     31#if USE_IOC_RDK
    3232#include <reset_rdk.h>
    3333#endif
     
    4242#elif USE_IOC_SPI
    4343    return reset_sdc_init();
    44 #elif USE_RAMDISK
     44#elif USE_IOC_RDK
    4545    return reset_rdk_init();
    4646#else
     
    6565#elif USE_IOC_SPI
    6666    return reset_sdc_read(lba, buffer, count);
    67 #elif USE_RAMDISK
     67#elif USE_IOC_RDK
    6868    return reset_rdk_read(lba, buffer, count);
    6969#else
Note: See TracChangeset for help on using the changeset viewer.