diff --git a/modules/wishbone/wb_crossbar/xwb_crossbar.vhd b/modules/wishbone/wb_crossbar/xwb_crossbar.vhd
index 8ba53a2fdf4a859cb34161d9b55cc93376ee0ce8..cf77bb0a0846e1cbb1ec6c316b49b976719b7f97 100644
--- a/modules/wishbone/wb_crossbar/xwb_crossbar.vhd
+++ b/modules/wishbone/wb_crossbar/xwb_crossbar.vhd
@@ -55,7 +55,9 @@ entity xwb_crossbar is
     g_registered  : boolean := false;
     -- Address of the slaves connected
     g_address     : t_wishbone_address_array;
-    g_mask        : t_wishbone_address_array);
+    g_mask        : t_wishbone_address_array;
+   -- Set to false to skip "Mapping Slave" notes during simulation
+    g_verbose     : boolean := true);
   port(
     clk_sys_i     : in  std_logic;
     rst_n_i       : in  std_logic;
@@ -111,10 +113,12 @@ architecture rtl of xwb_crossbar is
       severity Failure;
       
       -- Working case
-      report "Mapping slave #" & 
-             Integer'image(i) & "[" & f_bits2string(c_address(i)) & "/" &
-                                      f_bits2string(c_mask(i)) & "]"
-      severity Note;
+      if g_verbose then
+        report "Mapping slave #" &
+          Integer'image(i) & "[" & f_bits2string(c_address(i)) & "/" &
+          f_bits2string(c_mask(i)) & "]"
+          severity Note;
+      end if;
     end loop;
     return true;
   end f_ranges_ok;
diff --git a/modules/wishbone/wb_crossbar/xwb_sdb_crossbar.vhd b/modules/wishbone/wb_crossbar/xwb_sdb_crossbar.vhd
index 9c3b26bf4a04032e7bf22e1f153493abd5858ac8..3c5f8196e91b2c18a6d2a724dbb52be6adc85e58 100644
--- a/modules/wishbone/wb_crossbar/xwb_sdb_crossbar.vhd
+++ b/modules/wishbone/wb_crossbar/xwb_sdb_crossbar.vhd
@@ -31,6 +31,7 @@ use work.wishbone_pkg.all;
 
 entity xwb_sdb_crossbar is
   generic(
+    g_verbose     : boolean := true;
     g_num_masters : natural := 1;
     g_num_slaves  : natural := 1;
     g_registered  : boolean := false;
@@ -232,7 +233,8 @@ begin
       g_num_slaves  => g_num_slaves + 1,
       g_registered  => g_registered,
       g_address     => c_address,
-      g_mask        => c_mask)
+      g_mask        => c_mask,
+      g_verbose     => g_verbose)
     port map(
       clk_sys_i     => clk_sys_i,
       rst_n_i       => rst_n_i,
@@ -248,7 +250,8 @@ begin
       g_num_slaves  => g_num_masters,
       g_registered  => g_registered,
       g_address     => c_addresses.msi_address,
-      g_mask        => c_addresses.msi_mask)
+      g_mask        => c_addresses.msi_mask,
+      g_verbose     => g_verbose)
     port map(
       clk_sys_i     => clk_sys_i,
       rst_n_i       => rst_n_i,
diff --git a/modules/wishbone/wishbone_pkg.vhd b/modules/wishbone/wishbone_pkg.vhd
index 573eceb12f2ccc3daa156964aedd84007e3de85f..f7a43281dc5196b87732e82982ae6a9891767582 100644
--- a/modules/wishbone/wishbone_pkg.vhd
+++ b/modules/wishbone/wishbone_pkg.vhd
@@ -390,7 +390,8 @@ package wishbone_pkg is
       g_num_slaves  : integer;
       g_registered  : boolean;
       g_address     : t_wishbone_address_array;
-      g_mask        : t_wishbone_address_array);
+      g_mask        : t_wishbone_address_array;
+      g_verbose     : boolean := true);
     port (
       clk_sys_i : in  std_logic;
       rst_n_i   : in  std_logic;
@@ -419,6 +420,7 @@ package wishbone_pkg is
 
   component xwb_sdb_crossbar
     generic (
+      g_verbose     : boolean := true;
       g_num_masters : integer;
       g_num_slaves  : integer;
       g_registered  : boolean := false;