Changeset 546 for trunk/tools

Timestamp:

Sep 21, 2018, 10:23:16 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Make hard_config.h generate from params-hard IOC_TYPE

Location:

trunk/tools/arch_info

Files:

• arch_classes.py (modified) (3 diffs)
• genarch.py (modified) (1 diff)

trunk/tools/arch_info/arch_classes.py

@@ -363 +363 @@
 
     ######################################################################
-    def hard_config( self ):     # compute string for hard_config.h file 
+    def hard_config( self, ioc_type ):     # compute string for hard_config.h file 
                                  # required by
                                  # - top.cpp compilation
@@ -557 +557 @@
 
         # one and only one IOC controller
-        assert ( nb_ioc == 1 )
+        # assert ( nb_ioc == 1 )
 
         # compute rdk_base and rdk_size
@@ -623 +623 @@
         s += '#define USE_DMA                %d\n'    % ( nb_dma != 0 )
         s += '\n'
-        s += '#define USE_IOC_BDV            %d\n'    % use_ioc_bdv
-        s += '#define USE_IOC_SDC            %d\n'    % use_ioc_sdc
-        s += '#define USE_IOC_HBA            %d\n'    % use_ioc_hba
-        s += '#define USE_IOC_SPI            %d\n'    % use_ioc_spi
+        s += '#define USE_IOC_BDV            %d\n'    % (use_ioc_bdv and ioc_type == "IOC_BDV")
+        s += '#define USE_IOC_SDC            %d\n'    % (use_ioc_sdc and ioc_type == "IOC_SDC")
+        s += '#define USE_IOC_HBA            %d\n'    % (use_ioc_hba and ioc_type == "IOC_HBA")
+        s += '#define USE_IOC_SPI            %d\n'    % (use_ioc_spi and ioc_type == "IOC_SPI")
         s += '#define USE_IOC_RDK            %d\n'    % use_ioc_rdk
         s += '\n'

trunk/tools/arch_info/genarch.py

@@ -167 +167 @@
     pathname = hard_path + '/hard_config.h'
     f = open ( pathname, 'w' )
-    f.write( archinfo.hard_config() )
+    f.write( archinfo.hard_config( ioc_type ) )
     print '[genarch] %s generated' % pathname