Reinier van der Walle
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
      hdr_fields_in_arr     => nw_10GbE_hdr_fields_in_arr 
    );
  END GENERATE;
+  
+  -----------------------------------------------------------------------------
+  -- Interface : 10GbE
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
  );

  ---------------------------------------------------------------
  -- MM master multiplexer 
  ---------------------------------------------------------------
-  -- Not yet implemented
+  -- Connect 2 mm_masters to the common_mem_mux output
+  master_mosi_arr(0)  <= ram_st_bst_mosi;    -- MM access via QSYS MM bus
+  ram_st_bst_miso     <= master_miso_arr(0);
+  master_mosi_arr(1)  <= ram_st_offload_mosi;   -- MM access by SST offload
+  ram_st_offload_miso <= master_miso_arr(1);
+
+  u_mem_master_mux : ENTITY mm_lib.mm_master_mux
+  GENERIC MAP (
+    g_nof_masters    => c_nof_masters,
+    g_rd_latency_min => 1  -- TODO, make constant and check if value is right