In a bowl, cream butter and sugar. Add eggs and vanilla, mix well. Combine 2 cups of flour, baking powder, and salt, add to creamed mixture alternately with buttermilk. Mix well.
Toss berries in remaining flour, fold into batter (discard any flour that doesn't stick to berries). Spread batter into a greased 9 inch square baking pan.
For the topping combine flour, sugars, and cinnamon, cut in butter, until resembles coarse crumbs. Sprinkle over batter. Bake at 375 degrees for 25-30 minutes until toothpick comes out clean. Cool on wire rack.