Changeset 556 for trunk/boot


Ignore:
Timestamp:
Sep 21, 2018, 10:25:39 PM (3 years ago)
Author:
nicolas.van.phan@…
Message:

Gather LETI-specific macros into hard_config.h

Location:
trunk/boot/tsar_mips32
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/boot/tsar_mips32/boot.c

    r552 r556  
    404404    boot_info->x_max        = header->x_size; // [FIXME]
    405405    boot_info->y_max        = header->name[5] == 'l' ? header->y_size - 1 : header->y_size; // [FIXME]
    406     boot_info->use_mty0     = header->name[5] == 'l' ? true : false;
    407406    boot_info->paddr_width  = header->paddr_width;
    408407    boot_info->io_cxy       = header->io_cxy;
  • trunk/boot/tsar_mips32/boot_tty_driver.c

    r541 r556  
    4343#endif
    4444
    45 #ifdef IS_LETI
    46   #define TARGET_CLUSTER    0
    47 #else
    48   #define TARGET_CLUSTER    ((X_IO << Y_WIDTH) + Y_IO)
     45#ifndef TXT_TGT_CLUSTER
     46# error "The TXT_TGT_CLUSTER value should be defined in the 'hard_config.h' file"
    4947#endif
    50 
    5148
    5249/////////////////////////////////////////////////////////////////////////////
     
    5754static uint32_t boot_tty_get_register( uint32_t reg )
    5855{
    59     cxy_t      cxy = TARGET_CLUSTER;
     56    cxy_t      cxy = TXT_TGT_CLUSTER;
    6057    uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;
    6158   
     
    7269                                   uint32_t val )
    7370{
    74     cxy_t      cxy = TARGET_CLUSTER;
     71    cxy_t      cxy = TXT_TGT_CLUSTER;
    7572    uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;
    7673
Note: See TracChangeset for help on using the changeset viewer.