tools/i3c_config: Handle booleans in configs

Define if set to 'True'.

Signed-off-by: Wiktoria Kuna <[email protected]>

Author: wkkuna

src/i3c.sv

@@ -44,9 +44,11 @@ module i3c
     parameter int unsigned HciCmdFifoDepth = `CMD_FIFO_DEPTH,
     parameter int unsigned HciRxFifoDepth = `RX_FIFO_DEPTH,
     parameter int unsigned HciTxFifoDepth = `TX_FIFO_DEPTH,
-    parameter int unsigned HciIbiFifoDepth = (`IBI_FIFO_EXT_SIZE)
-                                                ? (8 * `IBI_FIFO_DEPTH)
-                                                : (`IBI_FIFO_DEPTH),
+`ifdef IBI_FIFO_EXT_SIZE
+    parameter int unsigned HciIbiFifoDepth = 8 * `IBI_FIFO_DEPTH,
+`else
+    parameter int unsigned HciIbiFifoDepth = `IBI_FIFO_DEPTH,
+`endif
 
     localparam int unsigned HciRespFifoDepthWidth = $clog2(HciRespFifoDepth + 1),
     localparam int unsigned HciCmdFifoDepthWidth  = $clog2(HciCmdFifoDepth + 1),
@@ -70,9 +72,11 @@ module i3c
     parameter int unsigned TtiTxDescFifoDepth = `CMD_FIFO_DEPTH,
     parameter int unsigned TtiRxFifoDepth = `RX_FIFO_DEPTH,
     parameter int unsigned TtiTxFifoDepth = `TX_FIFO_DEPTH,
-    parameter int unsigned TtiIbiFifoDepth = (`IBI_FIFO_EXT_SIZE)
-                                                ? (8 * `IBI_FIFO_DEPTH)
-                                                : (`IBI_FIFO_DEPTH),
+`ifdef IBI_FIFO_EXT_SIZE
+    parameter int unsigned TtiIbiFifoDepth = 8 * `IBI_FIFO_DEPTH,
+`else
+    parameter int unsigned TtiIbiFifoDepth = `IBI_FIFO_DEPTH,
+`endif
     localparam int unsigned TtiTxDescFifoDepthWidth = $clog2(TtiTxDescFifoDepth + 1),
     localparam int unsigned TtiRxDescFifoDepthWidth = $clog2(TtiRxDescFifoDepth + 1),
     localparam int unsigned TtiTxFifoDepthWidth = $clog2(TtiTxFifoDepth + 1),

src/i3c_defines.svh

@@ -5,19 +5,18 @@
 `ifndef I3C_CONFIG
 `define I3C_CONFIG
 
-  `define CMD_FIFO_DEPTH    64
-  `define RX_FIFO_DEPTH     64
-  `define TX_FIFO_DEPTH     64
-  `define RESP_FIFO_DEPTH   64
-  `define IBI_FIFO_DEPTH    64
-  `define IBI_FIFO_EXT_SIZE 0
-  `define DAT_DEPTH         128
-  `define DCT_DEPTH         128
-  `define I3C_USE_AXI       1
-  `define AXI_ADDR_WIDTH    12
-  `define AXI_DATA_WIDTH    32
-  `define AXI_USER_WIDTH    32
-  `define AXI_ID_WIDTH      8
-  `define DISABLE_INPUT_FF  1
+  `define CMD_FIFO_DEPTH   64
+  `define RX_FIFO_DEPTH    64
+  `define TX_FIFO_DEPTH    64
+  `define RESP_FIFO_DEPTH  64
+  `define IBI_FIFO_DEPTH   64
+  `define DAT_DEPTH        128
+  `define DCT_DEPTH        128
+  `define I3C_USE_AXI      1
+  `define AXI_ADDR_WIDTH   12
+  `define AXI_DATA_WIDTH   32
+  `define AXI_USER_WIDTH   32
+  `define AXI_ID_WIDTH     8
+  `define DISABLE_INPUT_FF 1
 
 `endif  // I3C_CONFIG

tools/i3c_config/common.py

@@ -82,17 +82,20 @@ def __init__(self, cfg: I3CGenericConfig) -> None:
             # PascalCase -> UPPER_SNAKE_CASE
             new_name = self._format_name(name).replace("FRONTEND_BUS", bus)
 
-            # Resolve the parameter type (i.e. booleans)
-            self._defines[new_name] = self._py_to_sv_type(value, name)
+            # Resolve the parameter type
+            value = self._py_to_sv_type(value, name)
+            # Skips boolean parameters that are set to 'False'
+            if value is not None:
+                self._defines[new_name] = value
 
     # Change camel case name format to upper snake case
     def _format_name(self, name: str) -> str:
         return re.sub(r"(?<!^)(?=[A-Z])", "_", name).upper()
 
     def _py_to_sv_type(self, element: any, name: str) -> int | str:
         match element:
-            case bool():  # Bool is not supported, use 0 or 1
-                return int(element)
+            case bool():
+                return 1 if element else None
             case str():  # Ensure the resulting definition contains ""
                 return f'"{element}"'
             case list():  # Run recursively on each element & return a string