diff --git a/util/example/tlgen/xbar_2x2.hjson b/util/example/tlgen/xbar_2x2.hjson
index 38a270e02e3d7..9b3d39150850f 100644
--- a/util/example/tlgen/xbar_2x2.hjson
+++ b/util/example/tlgen/xbar_2x2.hjson
@@ -18,12 +18,14 @@
       type: "host",
       clock: "clk_main_i",
       reset: "rst_main_ni"
+      addr_space: "hart",
       xbar: false
     },
     { name: "h1",
       type: "host",
       clock: "clk_periph_i",
       reset: "rst_periph_ni"
+      addr_space: "hart",
       xbar: false
     },
     { name: "d0",
@@ -31,7 +33,9 @@
       clock: "clk_main_i",
       reset: "rst_main_ni",
       addr_range: [{
-        base_addr: "0x0000",
+        base_addrs: {
+          hart: 0x0000
+        },
         size_byte: "0x1000"
       }]
       xbar: false
@@ -41,7 +45,9 @@
       clock: "clk_main_i",
       reset: "rst_main_ni",
       addr_range: [{
-        base_addr: "0x1000",
+        base_addrs: {
+          hart: 0x1000
+        },
         size_byte: "0x1000"
       }]
       xbar: false
diff --git a/util/example/tlgen/xbar_main.hjson b/util/example/tlgen/xbar_main.hjson
index f598996fb0667..1b8bce927c3f5 100644
--- a/util/example/tlgen/xbar_main.hjson
+++ b/util/example/tlgen/xbar_main.hjson
@@ -22,6 +22,7 @@
       type:  "host",
       clock: "clk_main_i",
       reset: "rst_main_ni",
+      addr_space: "hart",
 
       xbar: false
       pipeline: false
@@ -30,6 +31,7 @@
       type:  "host",
       clock: "clk_periph_i",
       reset: "rst_periph_ni",
+      addr_space: "hart",
 
       xbar: false
       pipeline: false
@@ -38,6 +40,7 @@
       type:  "host",
       clock: "clk_jtag_i",
       reset: "rst_jtag_ni",
+      addr_space: "hart",
 
       xbar: false
     },
@@ -47,7 +50,9 @@
       reset: "rst_main_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x00000000",
+        base_addrs: {
+          hart: 0x00000000
+        },
         size_byte: "0x10000",   // 64kB
       }]
     },
@@ -57,7 +62,9 @@
       reset: "rst_jtag_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x10040000",
+        base_addrs: {
+          hart: 0x10040000
+        },
         size_byte: "0x1000"
       }]
     },
@@ -67,7 +74,9 @@
       reset: "rst_main_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x10000000",
+        base_addrs: {
+          hart: 0x10000000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -76,7 +85,9 @@
       // clock is omitted --> use default clock
       xbar: false
       addr_range: [{
-        base_addr: "0x10080000",
+        base_addrs: {
+          hart: 0x10080000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -86,7 +97,9 @@
       reset: "rst_periph_ni",
       xbar: false
       addr_range: [{
-        base_addr: "0x40000000",
+        base_addrs: {
+          hart: 0x40000000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -96,7 +109,9 @@
       reset: "rst_periph_ni",
       xbar: false
       addr_range: [{
-        base_addr: "0x40010000",
+        base_addrs: {
+          hart: 0x40010000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -106,7 +121,9 @@
       reset: "rst_periph_ni",
       xbar: false
       addr_range: [{
-        base_addr: "0x40020000",
+        base_addrs: {
+          hart: 0x40020000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -116,7 +133,9 @@
       reset: "rst_periph_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x40030000",
+        base_addrs: {
+          hart: 0x40030000
+        },
         size_byte: "0x10000",
       }]
     },
@@ -126,7 +145,9 @@
       reset: "rst_main_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x50000000",
+        base_addrs: {
+          hart: 0x50000000
+        },
         size_byte: "0x1000"
       }]
     },
@@ -136,7 +157,9 @@
       reset: "rst_main_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x50010000",
+        base_addrs: {
+          hart: 0x50010000
+        },
         size_byte: "0x1000"
       }]
     },
@@ -146,7 +169,9 @@
       reset: "rst_main_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x50020000",
+        base_addrs: {
+          hart: 0x50020000
+        },
         size_byte: "0x1000"
       }]
     },
@@ -158,7 +183,9 @@
       reset: "rst_crypt_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x60000000",
+        base_addrs: {
+          hart: 0x60000000
+        },
         size_byte: "0x8000"
       }]
     },
@@ -168,7 +195,9 @@
       reset: "rst_crypt_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x60010000",
+        base_addrs: {
+          hart: 0x60010000
+        },
         size_byte: "0x10000"
       }]
     },
@@ -178,7 +207,9 @@
       reset: "rst_crypt_ni",
       xbar:  false
       addr_range: [{
-        base_addr: "0x60080000",
+        base_addrs: {
+          hart: 0x60080000
+        },
         size_byte: "0x20000"
       }]
     },