diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile
index 103987af..125eabce 100644
--- a/fuzzers/005-tilegrid/Makefile
+++ b/fuzzers/005-tilegrid/Makefile
@@ -1,9 +1,11 @@
 FUZDIR=$(shell pwd)
 BUILD_DIR=$(FUZDIR)/build
 TILEGRID_TDB_DEPENDENCIES=iob/build/segbits_tilegrid.tdb mmcm/build/segbits_tilegrid.tdb pll/build/segbits_tilegrid.tdb
+GENERATE_FULL_ARGS=
 
 ifeq (${XRAY_DATABASE}, zynq7)
 TILEGRID_TDB_DEPENDENCIES += ps7_int/build/segbits_tilegrid.tdb
+GENERATE_FULL_ARGS += --int-tdb $(FUZDIR)/ps7_int/build/segbits_tilegrid.tdb
 endif
 
 database: build/tilegrid.json
@@ -49,9 +51,7 @@ monitor/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
 build/tilegrid.json: generate_full.py build/tilegrid_tdb.json build/clb/deltas build/bram/deltas
 	cd build && python3 ${FUZDIR}/generate_full.py \
         --json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json \
-        --tiles $(FUZDIR)/build/tiles/tiles.txt clb/design_*.delta bram/design_*.delta \
-        --int-tdb $(FUZDIR)/ps7_int/build/segbits_tilegrid.tdb
-
+        --tiles $(FUZDIR)/build/tiles/tiles.txt clb/design_*.delta bram/design_*.delta ${GENERATE_FULL_ARGS}
 run:
 	$(MAKE) clean
 	$(MAKE) database
diff --git a/fuzzers/005-tilegrid/generate_full.py b/fuzzers/005-tilegrid/generate_full.py
index 8bac84b5..5188623c 100644
--- a/fuzzers/005-tilegrid/generate_full.py
+++ b/fuzzers/005-tilegrid/generate_full.py
@@ -551,7 +551,7 @@ def db_int_fixup(database, tiles, tiles_by_grid):
                 tile_name, tile, baseaddr, offset, frames, words, height)
 
 
-def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb, verbose=False):
+def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb=None, verbose=False):
     # Load input files
     tiles = load_tiles(tiles_fn)
     site_baseaddr = load_baseaddrs(deltas_fns)
@@ -570,8 +570,9 @@ def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb, verbose=False):
     db_add_bits(database, segments)
     db_add_segments(database, segments)
 
-    tile_baseaddrs_fixup = load_tdb_baseaddr(database, int_tdb)
-    db_int_fixup(database, tile_baseaddrs_fixup, tiles_by_grid)
+    if int_tdb is not None:
+        tile_baseaddrs_fixup = load_tdb_baseaddr(database, int_tdb)
+        db_int_fixup(database, tile_baseaddrs_fixup, tiles_by_grid)
 
     # Save
     json.dump(
@@ -602,6 +603,7 @@ def main():
         "deltas", nargs="*", help=".bit diffs to create base addresses from")
     parser.add_argument(
         "--int-tdb",
+        default=None,
         help=".tdb diffs to fill the interconnects without any adjacent CLB")
     args = parser.parse_args()