Changeset 556 for trunk/tools/arch_info

Timestamp:

Sep 21, 2018, 10:25:39 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Gather LETI-specific macros into hard_config.h

Location:

trunk/tools/arch_info

Files:

• arch_classes.py (modified) (3 diffs)
• boot_info.h (modified) (1 diff)

trunk/tools/arch_info/arch_classes.py

@@ -605 +605 @@
         s += '#define BOOT_CORE_CXY          %d\n'    % self.boot_cxy
         s += '#define CACHE_LINE_SIZE        %d\n'    % self.cache_line
-        if (self.name[5] == 'l') :
-            s += '#define IS_LETI              \n'
         s += '#define RESET_SYSTEM_CLK       %d\n'    % sys_clk
         s += '\n'
@@ -630 +628 @@
         s += '#define USE_IOC_RDK            %d\n'    % use_ioc_rdk
         s += '\n'
+        s += '#define USE_TXT_TTY            %d\n'    % (self.name[5] != 'l') # use TTY implementation on IOB
+        s += '#define USE_TXT_MTY            %d\n'    % (self.name[5] == 'l') # use MTY implementation on LETI
+        s += '\n'
         s += '#define FBUF_X_SIZE            %d\n'    % fbf_arg0
         s += '#define FBUF_Y_SIZE            %d\n'    % fbf_arg1
@@ -637 +638 @@
         s += '#define ICU_NB_WTI             %d\n'    % icu_arg2
         s += '#define ICU_NB_OUT             %d\n'    % icu_arg3
+        s += '\n'
+        if (self.name[5] == 'l') : # If running on LETI
+            s += '#define TXT_TGT_CLUSTER        0\n'
+        else : # Else, running on IOB
+            s += '#define TXT_TGT_CLUSTER        ((X_IO << Y_WIDTH) + Y_IO)\n'
         s += '\n'
 

trunk/tools/arch_info/boot_info.h

@@ -114 +114 @@
     uint32_t      x_max;                         /*! [FIXME] Nb of non-empty cluster in row */
     uint32_t      y_max;                         /*! [FIXME] Nb of non_empty cluster in col */
-    uint32_t      use_mty0;                      /*! [FIXME] Use multi_tty on cluster 0     */
         uint32_t      io_cxy;                        /*! IO cluster identifier                  */