Yes, mac-limit is the feature to limit how and what MACs can be connected to your switch.
bpdu-block-on-edge is related to what to do when a BPDU is received by a port configured as edge.
=====
If this worked for you please flag my post as an "Accepted Solution" so others can benefit. A kudo would be cool if you think I earned it.